Mesa (master): glsl/linker: Use correct array length when linking inter-stage uniforms and varyings.

Matt Turner mattst88 at kemper.freedesktop.org
Thu Jul 18 21:12:38 UTC 2013


Module: Mesa
Branch: master
Commit: 6368478712ab46edc18f2210527259d4d433235a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6368478712ab46edc18f2210527259d4d433235a

Author: Fabian Bieler <fabianbieler at fastmail.fm>
Date:   Fri Jun 14 13:37:07 2013 +0200

glsl/linker: Use correct array length when linking inter-stage uniforms and varyings.

Reviewed-by: Paul Berry <stereotype441 at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
Signed-off-by: Fabian Bieler <fabianbieler at fastmail.fm>

---

 src/glsl/linker.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index ba97ade..da56770 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -1147,7 +1147,7 @@ update_array_sizes(struct gl_shader_program *prog)
 	    }
 	 }
 
-	 if (size + 1 != var->type->fields.array->length) {
+	 if (size + 1 != var->type->length) {
 	    /* If this is a built-in uniform (i.e., it's backed by some
 	     * fixed-function state), adjust the number of state slots to
 	     * match the new array size.  The number of slots per array entry




More information about the mesa-commit mailing list