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/scenegraph/qsgshareddistancefieldglyphcache.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/scenegraph/qsgshareddistancefieldglyphcache.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp index fb9eebf403..34a884348d 100644 --- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp @@ -531,7 +531,7 @@ void QSGSharedDistanceFieldGlyphCache::saveTexture(GLuint textureId, int width, glEnableVertexAttribArray(0); glEnableVertexAttribArray(1); - int textureUniformLocation = glGetUniformLocation(shaderProgram, "texture"); + int textureUniformLocation = glGetUniformLocation(shaderProgram, "_qt_texture"); glUniform1i(textureUniformLocation, 0); } |