summaryrefslogtreecommitdiff
path: root/src/render/modernopenglgraphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-10 13:09:10 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-10 13:09:10 +0300
commitfcb2f8b6fdfa683ce5ba319b46873a0b61c9c75f (patch)
tree98182f19e3e42443abfcbaff0cc1158eaa335a68 /src/render/modernopenglgraphics.cpp
parent61e9fc59323157bbd3ea024e816981b975d5b2c8 (diff)
downloadmv-fcb2f8b6fdfa683ce5ba319b46873a0b61c9c75f.tar.gz
mv-fcb2f8b6fdfa683ce5ba319b46873a0b61c9c75f.tar.bz2
mv-fcb2f8b6fdfa683ce5ba319b46873a0b61c9c75f.tar.xz
mv-fcb2f8b6fdfa683ce5ba319b46873a0b61c9c75f.zip
Use same varaible names in simple and texture shaders.
Diffstat (limited to 'src/render/modernopenglgraphics.cpp')
-rw-r--r--src/render/modernopenglgraphics.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index 98e125170..fd700a9cf 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -124,12 +124,12 @@ void ModernOpenGLGraphics::postInit()
{
logger->log("Shaders compilation done.");
mglUseProgram(mSimpleProgramId);
- mSimplePosAttrib = mglGetAttribLocation(mSimpleProgramId, "simplePos");
+ mSimplePosAttrib = mglGetAttribLocation(mSimpleProgramId, "position");
mglEnableVertexAttribArray(mSimplePosAttrib);
- mSimpleColorUniform = mglGetUniformLocation(mSimpleProgramId, "simpleColor");
+ mSimpleColorUniform = mglGetUniformLocation(mSimpleProgramId, "color");
mSimpleScreenUniform = mglGetUniformLocation(mSimpleProgramId, "screen");
- mTexturePosAttrib = mglGetAttribLocation(mTextureProgramId, "texturePos");
+ mTexturePosAttrib = mglGetAttribLocation(mTextureProgramId, "position");
mTexAttrib = mglGetAttribLocation(mTextureProgramId, "texcoord");
mTextureScreenUniform = mglGetUniformLocation(mTextureProgramId, "screen");