From a98dccca36027fc0ed333075ab30176144e6c475 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Wed, 14 Jan 2009 16:32:44 +0000 Subject: [PATCH] glsl: fix regression from sampler arrays commit --- src/mesa/shader/slang/slang_codegen.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c index a19fc0b1062..b046cc2402a 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. -- 2.30.2