diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-22 09:07:27 -0600 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-22 09:07:27 -0600 |
| commit | 1bf81e3c5d65b636658d11072f4f027f5c499396 (patch) | |
| tree | 9a32e209d11e797d390cc2b9961f8fa96010795c /src/mesa/shader/nvfragparse.c | |
| parent | 1936b25ebd580c5ef9e8cb471a986da39ef46ca5 (diff) | |
| download | external_mesa3d-1bf81e3c5d65b636658d11072f4f027f5c499396.zip external_mesa3d-1bf81e3c5d65b636658d11072f4f027f5c499396.tar.gz external_mesa3d-1bf81e3c5d65b636658d11072f4f027f5c499396.tar.bz2 | |
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().
Diffstat (limited to 'src/mesa/shader/nvfragparse.c')
| -rw-r--r-- | src/mesa/shader/nvfragparse.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c index b4e19ce..c46d8aa 100644 --- a/src/mesa/shader/nvfragparse.c +++ b/src/mesa/shader/nvfragparse.c @@ -1040,7 +1040,7 @@ Parse_VectorSrc(struct parse_state *parseState, if (!Parse_ScalarConstant(parseState, values)) RETURN_ERROR; paramIndex = _mesa_add_unnamed_constant(parseState->parameters, - values, 4, &swizzle); + values, 4, NULL); ASSERT(swizzle == SWIZZLE_NOOP); srcReg->File = PROGRAM_NAMED_PARAM; srcReg->Index = paramIndex; @@ -1053,7 +1053,7 @@ Parse_VectorSrc(struct parse_state *parseState, if (!Parse_VectorConstant(parseState, values)) RETURN_ERROR; paramIndex = _mesa_add_unnamed_constant(parseState->parameters, - values, 4, &swizzle); + values, 4, NULL); ASSERT(swizzle == SWIZZLE_NOOP); srcReg->File = PROGRAM_NAMED_PARAM; srcReg->Index = paramIndex; @@ -1145,7 +1145,7 @@ Parse_ScalarSrcReg(struct parse_state *parseState, if (!Parse_VectorConstant(parseState, values)) RETURN_ERROR; paramIndex = _mesa_add_unnamed_constant(parseState->parameters, - values, 4, &swizzle); + values, 4, NULL); ASSERT(swizzle == SWIZZLE_NOOP); srcReg->File = PROGRAM_NAMED_PARAM; srcReg->Index = paramIndex; @@ -1171,7 +1171,7 @@ Parse_ScalarSrcReg(struct parse_state *parseState, if (!Parse_ScalarConstant(parseState, values)) RETURN_ERROR; paramIndex = _mesa_add_unnamed_constant(parseState->parameters, - values, 4, &swizzle); + values, 4, NULL); ASSERT(swizzle == SWIZZLE_NOOP); srcReg->Index = paramIndex; srcReg->File = PROGRAM_NAMED_PARAM; |