glsl: fix regression from sampler arrays commit
authorAlan Hourihane <alanh@vmware.com>
Wed, 14 Jan 2009 16:32:44 +0000 (16:32 +0000)
committerAlan Hourihane <alanh@vmware.com>
Wed, 14 Jan 2009 16:32:44 +0000 (16:32 +0000)
src/mesa/shader/slang/slang_codegen.c

index dbd623250d7020ac5fcc2e97a9c73dc1b0ab26ca..5cb472bed0f64851c7154f70d4f3754147ed6f4a 100644 (file)
@@ -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.