summaryrefslogtreecommitdiff
path: root/src
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:34:19 +0000
commita98dccca36027fc0ed333075ab30176144e6c475 (patch)
tree10d8e2d0eb98bede014f864744e1ecac8b7d2771 /src
parent1b3e3e6b841535b78ff4fa1d3861e9d8cdeff972 (diff)
glsl: fix regression from sampler arrays commit
Diffstat (limited to 'src')
-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 a19fc0b106..b046cc2402 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -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.