Make QSGMaterialRhiShader become QSGMaterialShader

After a symbiotic relationship in Qt 5.14 and 5.15, it is time for
QSGMaterialRhiShader to devour its older sibling and take its place.

This makes the direct OpenGL rendering path disfunctional. All
QSGMaterial Qt 6 TODOs are solved, the API is clean and straightforward
again: a QSGMaterial creates a QSGMaterialShader, no special flags and
options needed. (it's just that QSGMaterialShader now has a slightly
different API)

Task-number: QTBUG-79268
Task-number: QTBUG-82997
Change-Id: I545ca8d796c5535e81957c706e7832133be15b7d
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/quick/scenegraph/qsgdefaultrendercontext_p.h b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
index be83f5a9f5..b6ed57ba6a 100644
--- a/src/quick/scenegraph/qsgdefaultrendercontext_p.h
+++ b/src/quick/scenegraph/qsgdefaultrendercontext_p.h
@@ -65,7 +65,6 @@ class QRhiCommandBuffer;
 class QRhiRenderPassDescriptor;
 class QOpenGLContext;
 class QSGMaterialShader;
-class QSGMaterialRhiShader;
 class QOpenGLFramebufferObject;
 class QSGDepthStencilBufferManager;
 class QSGDepthStencilBuffer;
@@ -130,9 +129,9 @@ public:
     QSGRenderer *createRenderer() override;
     QSGTexture *compressedTextureForFactory(const QSGCompressedTextureFactory *factory) const override;
 
-    virtual void compileShader(QSGMaterialShader *shader, QSGMaterial *material, const char *vertexCode = nullptr, const char *fragmentCode = nullptr);
-    virtual void initializeShader(QSGMaterialShader *shader);
-    virtual void initializeRhiShader(QSGMaterialRhiShader *shader, QShader::Variant shaderVariant);
+    virtual void compileShader(QSGMaterialShader *shader, QSGMaterial *material, const char *vertexCode = nullptr, const char *fragmentCode = nullptr); // legacy GL only
+    virtual void initializeShader(QSGMaterialShader *shader); // legacy GL only
+    virtual void initializeRhiShader(QSGMaterialShader *shader, QShader::Variant shaderVariant);
 
     void setAttachToGraphicsContext(bool attach) override;