diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 48: When setting a uniform for a program make sure that the program is in use.

Message ID 20110721123633.17019.68681.launchpad@loganberry.canonical.com
State Accepted
Headers show

Commit Message

Alexandros Frantzis July 21, 2011, 12:36 p.m. UTC 
------------------------------------------------------------
revno: 48
committer: Alexandros Frantzis <alf82@freemail.gr>
timestamp: Mon 2010-07-12 19:14:14 +0300
message:
  When setting a uniform for a program make sure that the program is in use.
modified:
  src/shader.cpp


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'src/shader.cpp'
--- src/shader.cpp	2010-07-12 10:06:29 +0000
+++ src/shader.cpp	2010-07-12 16:14:14 +0000
@@ -99,7 +99,9 @@ 
             "MaterialColor");
     mLocations.MaterialTexture0 = glGetUniformLocation(mShaderProgram,
             "MaterialTexture0");
+    glUseProgram(mShaderProgram);
     glUniform1i(mLocations.MaterialTexture0, 0);
+    glUseProgram(0);
 
 #ifdef _DEBUG
     printf("Uniform Locations: %d %d %d %d %d %d %d %d %d %d %d %d\n",