From 1bf81e3c5d65b636658d11072f4f027f5c499396 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 22 Mar 2007 09:07:27 -0600 Subject: In _mesa_add_unnamed_constant() and _mesa_lookup_parameter_constant() allow swizzleOut==NULL. There are times when we don't want to allow swizzling when searching for or adding vector constants. Passing NULL for swizzleOut disables swizzling. This fixes a constant/swizzle bug in link_uniform_vars(). --- src/mesa/shader/slang/slang_link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mesa/shader/slang/slang_link.c') diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c index a3cc2333ec..bcd54d6fe9 100644 --- a/src/mesa/shader/slang/slang_link.c +++ b/src/mesa/shader/slang/slang_link.c @@ -172,10 +172,10 @@ link_uniform_vars(struct gl_shader_program *shProg, struct gl_program *prog) j = _mesa_lookup_parameter_index(shProg->Uniforms, -1, p->Name); } else { - GLuint swizzle; + /*GLuint swizzle;*/ ASSERT(p->Type == PROGRAM_CONSTANT); if (_mesa_lookup_parameter_constant(shProg->Uniforms, pVals, - p->Size, &j, &swizzle)) { + p->Size, &j, NULL)) { assert(j >= 0); } else { -- cgit v1.2.3