Don't use reserved keyword "texture" as uniform variable name
authorSean Harmer <sean.harmer@kdab.com>
Sat, 19 Oct 2013 13:21:31 +0000 (14:21 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 21 Oct 2013 17:10:50 +0000 (19:10 +0200)
commitde31a57672ec461c2081f65e3631134ee45de887
tree98678959c8af0bc36629c97ecf0c2ede77e05db2
parenta3f01331263eddbc502fb88734568ac38df5e316
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>
src/particles/qquickimageparticle.cpp
src/quick/items/qquickanimatedsprite.cpp
src/quick/items/qquickspritesequence.cpp
src/quick/scenegraph/qsgdefaultglyphnode_p.cpp
src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp