diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2013-10-19 14:21:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-21 19:10:50 +0200 |
| commit | de31a57672ec461c2081f65e3631134ee45de887 (patch) | |
| tree | 98678959c8af0bc36629c97ecf0c2ede77e05db2 /src/quick/items/qquickanimatedsprite.cpp | |
| parent | a3f01331263eddbc502fb88734568ac38df5e316 (diff) | |
Don't use reserved keyword "texture" as uniform variable name
The "texture" keyword is a function name in OpenGL core profile. This
commit is in preparation for making the Qt Quick 2 renderer and
materials work with a core profile context.
Change-Id: Iad243e64ab8db739fc46b85bb626bdb8b9ceb208
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/quick/items/qquickanimatedsprite.cpp')
| -rw-r--r-- | src/quick/items/qquickanimatedsprite.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickanimatedsprite.cpp b/src/quick/items/qquickanimatedsprite.cpp index 3a32169447..846de15581 100644 --- a/src/quick/items/qquickanimatedsprite.cpp +++ b/src/quick/items/qquickanimatedsprite.cpp @@ -80,14 +80,14 @@ static const char vertexShaderCode[] = "}\n"; static const char fragmentShaderCode[] = - "uniform sampler2D texture;\n" + "uniform sampler2D _qt_texture;\n" "uniform lowp float qt_Opacity;\n" "\n" "varying highp vec4 fTexS;\n" "varying lowp float progress;\n" "\n" "void main() {\n" - " gl_FragColor = mix(texture2D(texture, fTexS.xy), texture2D(texture, fTexS.zw), progress) * qt_Opacity;\n" + " gl_FragColor = mix(texture2D(_qt_texture, fTexS.xy), texture2D(_qt_texture, fTexS.zw), progress) * qt_Opacity;\n" "}\n"; class QQuickAnimatedSpriteMaterial : public QSGMaterial |