From: Alexander von Gluck <kallisti5@unixzen.com>
Date: Fri, 30 Dec 2011 15:48:43 +0000 (-0700)
Subject: glsl: fix usage of potentially undefined data_end union
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=141d961d847111b2596f9c3094d5ebf1639c8c24;p=mesa.git

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

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;