Mesa (master): mesa: var renaming, new assertion

Brian Paul brianp at kemper.freedesktop.org
Wed Aug 26 18:09:21 UTC 2009


Module: Mesa
Branch: master
Commit: f05344fcea329c6dee04356a71323f0b7ac71566
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f05344fcea329c6dee04356a71323f0b7ac71566

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Aug 26 10:58:06 2009 -0600

mesa: var renaming, new assertion

---

 src/mesa/shader/shader_api.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index b52be12..1b604f0 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -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);
       }
    }
 }




More information about the mesa-commit mailing list