Mesa (master): glsl: fix regression from sampler arrays commit
Alan Hourihane
alanh at kemper.freedesktop.org
Wed Jan 14 16:34:43 UTC 2009
Module: Mesa
Branch: master
Commit: a98dccca36027fc0ed333075ab30176144e6c475
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a98dccca36027fc0ed333075ab30176144e6c475
Author: Alan Hourihane <alanh at vmware.com>
Date: Wed Jan 14 16:32:44 2009 +0000
glsl: fix regression from sampler arrays commit
---
src/mesa/shader/slang/slang_codegen.c | 4 +---
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 a19fc0b..b046cc2 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.
More information about the mesa-commit
mailing list