summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@vmware.com>2009-01-14 16:32:44 +0000
committerAlan Hourihane <alanh@vmware.com>2009-01-14 16:32:44 +0000
commit1d376ae7c93fb4bb929942e56425c4be6401dff7 (patch)
tree72215610a14359e4c1a926d0ba7ed76e11f5b3b4
parent3ef419f4a5d0c5bb6720196ae6cfe3002d4aabc8 (diff)
glsl: fix regression from sampler arrays commit
-rw-r--r--src/mesa/shader/slang/slang_codegen.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index dbd623250d..5cb472bed0 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.