diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-02 14:27:13 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-06-02 15:16:46 +0200 |
commit | b87b3d3d43c200f22f0799ca59ab366d851b5db6 (patch) | |
tree | fb8258e0659a91934d2c77c359295da92e4221cd /src/quick/items/qquickopenglshadereffectnode.cpp | |
parent | 1f0b3a54ffa2ab0dc0cdff1345980ea68d749d24 (diff) |
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>
Diffstat (limited to 'src/quick/items/qquickopenglshadereffectnode.cpp')
-rw-r--r-- | src/quick/items/qquickopenglshadereffectnode.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/items/qquickopenglshadereffectnode.cpp b/src/quick/items/qquickopenglshadereffectnode.cpp index 919b92780a..019450935f 100644 --- a/src/quick/items/qquickopenglshadereffectnode.cpp +++ b/src/quick/items/qquickopenglshadereffectnode.cpp @@ -107,7 +107,7 @@ void QQuickCustomMaterialShader::deactivate() QOpenGLContext::currentContext()->functions()->glDisable(GL_CULL_FACE); } -void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMaterial *newEffect, QSGMaterial *oldEffect) +void QQuickCustomMaterialShader::updateState(const RenderState &, QSGMaterial *newEffect, QSGMaterial *) { typedef QQuickOpenGLShaderEffectMaterial::UniformData UniformData; @@ -142,6 +142,7 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri textureProviderIndex = 0; } +#if 0 QOpenGLFunctions *functions = state.context()->functions(); for (int shaderType = 0; shaderType < QQuickOpenGLShaderEffectMaterialKey::ShaderTypeCount; ++shaderType) { for (int i = 0; i < material->uniforms[shaderType].size(); ++i) { @@ -254,6 +255,7 @@ void QQuickCustomMaterialShader::updateState(const RenderState &state, QSGMateri break; } } +#endif } char const *const *QQuickCustomMaterialShader::attributeNames() const |