glsl: fix usage of potentially undefined data_end union
authorAlexander von Gluck <kallisti5@unixzen.com>
Fri, 30 Dec 2011 15:48:43 +0000 (08:48 -0700)
committerBrian Paul <brianp@vmware.com>
Fri, 30 Dec 2011 15:48:51 +0000 (08:48 -0700)
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Signed-off-by: Brian Paul <brianp@vmware.com>
src/glsl/link_uniforms.cpp

index c7de480a57392ba5377ef87c115d83b0b3cc7da5..b331db705cf8f433daa8731cc7674e6900374aa1 100644 (file)
@@ -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;