[Mesa-dev] [PATCH] glsl: fix usage of potentially undefined data_end union

Alexander von Gluck kallisti5 at unixzen.com
Thu Dec 29 08:48:30 PST 2011


---
  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;
-- 
1.7.7.2



More information about the mesa-dev mailing list