summaryrefslogtreecommitdiff
path: root/src/glsl/link_uniforms.cpp
diff options
context:
space:
mode:
authorAlexander von Gluck <kallisti5@unixzen.com>2011-12-30 08:48:43 -0700
committerBrian Paul <brianp@vmware.com>2011-12-30 08:48:51 -0700
commit141d961d847111b2596f9c3094d5ebf1639c8c24 (patch)
tree63a773f5b1cd0863a87b657ea63c4501d6f5ee6c /src/glsl/link_uniforms.cpp
parent797960dbeca675d8966752bc7a201f311123f3d5 (diff)
glsl: fix usage of potentially undefined data_end union
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/glsl/link_uniforms.cpp')
-rw-r--r--src/glsl/link_uniforms.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/link_uniforms.cpp b/src/glsl/link_uniforms.cpp
index c7de480a573..b331db705cf 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;