mesa: var renaming, new assertion
authorBrian Paul <brianp@vmware.com>
Wed, 26 Aug 2009 16:58:06 +0000 (10:58 -0600)
committerBrian Paul <brianp@vmware.com>
Wed, 26 Aug 2009 18:02:24 +0000 (12:02 -0600)
src/mesa/shader/shader_api.c

index b52be128c3b5d8f48c1c2bef2203d4cbb4f48918..1b604f0713c4cce73685d70acb07881e71167b32 100644 (file)
@@ -1553,10 +1553,11 @@ _mesa_update_shader_textures_used(struct gl_program *prog)
 
    for (s = 0; s < MAX_SAMPLERS; s++) {
       if (prog->SamplersUsed & (1 << s)) {
-         GLuint u = prog->SamplerUnits[s];
-         GLuint t = prog->SamplerTargets[s];
-         assert(u < MAX_TEXTURE_IMAGE_UNITS);
-         prog->TexturesUsed[u] |= (1 << t);
+         GLuint unit = prog->SamplerUnits[s];
+         GLuint tgt = prog->SamplerTargets[s];
+         assert(unit < MAX_TEXTURE_IMAGE_UNITS);
+         assert(tgt < NUM_TEXTURE_TARGETS);
+         prog->TexturesUsed[unit] |= (1 << tgt);
       }
    }
 }