Mesa (master): linker: Use helper variable sh

Ian Romanick idr at kemper.freedesktop.org
Sat Jan 19 01:36:39 UTC 2013


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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Thu Dec 13 12:42:02 2012 -0800

linker: Use helper variable sh

This looks like a copy-and-paste left over.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

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

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 70f3d5b..63548e0 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -885,8 +885,8 @@ link_intrastage_shaders(void *mem_ctx,
    for (unsigned i = 0; i < num_shaders; i++) {
       struct gl_shader *sh = shader_list[i];
 
-      for (unsigned j = 0; j < shader_list[i]->NumUniformBlocks; j++) {
-	 link_assign_uniform_block_offsets(shader_list[i]);
+      for (unsigned j = 0; j < sh->NumUniformBlocks; j++) {
+	 link_assign_uniform_block_offsets(sh);
 
 	 int index = link_cross_validate_uniform_block(mem_ctx,
 						       &uniform_blocks,




More information about the mesa-commit mailing list