Mesa (master): glsl: fix usage of potentially undefined data_end union
Brian Paul
brianp at kemper.freedesktop.org
Fri Dec 30 15:49:18 UTC 2011
Module: Mesa
Branch: master
Commit: 141d961d847111b2596f9c3094d5ebf1639c8c24
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=141d961d847111b2596f9c3094d5ebf1639c8c24
Author: Alexander von Gluck <kallisti5 at unixzen.com>
Date: Fri Dec 30 08:48:43 2011 -0700
glsl: fix usage of potentially undefined data_end union
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Brian Paul <brianp at vmware.com>
---
src/glsl/link_uniforms.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index c7de480..b331db7 100644
--- a/src/glsl/link_uniforms.cpp
+++ b/src/glsl/link_uniforms.cpp
@@ -365,9 +365,9 @@ link_assign_uniform_locations(struct gl_shader_program *prog)
for (unsigned i = 0; i < num_user_uniforms; i++) {
assert(uniforms[i].storage != NULL);
}
-#endif
assert(parcel.values == data_end);
+#endif
prog->NumUserUniformStorage = num_user_uniforms;
prog->UniformStorage = uniforms;
More information about the mesa-commit
mailing list