From: Alan Hourihane <alanh@vmware.com>
Date: Wed, 14 Jan 2009 16:32:44 +0000 (+0000)
Subject: glsl: fix regression from sampler arrays commit
X-Git-Tag: 062012170305~17580^2~496^2~115^2~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d376ae7c93fb4bb929942e56425c4be6401dff7;p=profile%2Fivi%2Fmesa.git

glsl: fix regression from sampler arrays commit
---

diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index dbd6232..5cb472b 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -4285,10 +4285,8 @@ _slang_codegen_global_variable(slang_assemble_ctx *A, slang_variable *var,
       }
 #endif
       {
-         const GLuint swizzle = _slang_var_swizzle(totalSize, 0);
          GLint sampNum = _mesa_add_sampler(prog->Parameters, varName, datatype);
-         store = _slang_new_ir_storage_swz(PROGRAM_SAMPLER, sampNum,
-                                                 totalSize, swizzle);
+         store = _slang_new_ir_storage(PROGRAM_SAMPLER, sampNum, texIndex);
 
          /* If we have a sampler array, then we need to allocate the 
 	  * additional samplers to ensure we don't allocate them elsewhere.