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:34:19 +0000 (16:34 +0000)
src/mesa/shader/slang/slang_codegen.c

index a19fc0b1062a24e29e782d3b840dd8ef5bf88526..b046cc2402a5d2b54e40b93850d2c406b15a1b58 100644 (file)
@@ -4292,10 +4292,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.