diff options
author | Brian <brian@yutani.localnet.net> | 2007-04-20 11:53:48 -0600 |
---|---|---|
committer | Brian <brian@yutani.localnet.net> | 2007-04-21 10:05:05 -0600 |
commit | 81c4fee160cd2840caf77bbdbf462e783911141a (patch) | |
tree | 76270e7f9fcc91eab0e5ad5f18182f9e9ef0dee2 /src | |
parent | 1fbdd9d794ca61512eb65d3e228f5fb29fb1ed83 (diff) |
remove unused vars, assertions
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/shader/nvfragparse.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c index ffa7ba4701..02da3ade7d 100644 --- a/src/mesa/shader/nvfragparse.c +++ b/src/mesa/shader/nvfragparse.c @@ -1140,13 +1140,12 @@ Parse_ScalarSrcReg(struct parse_state *parseState, else if (token[0] == '{') { /* vector literal */ GLfloat values[4]; - GLuint paramIndex, swizzle; + GLuint paramIndex; (void) Parse_String(parseState, "{"); if (!Parse_VectorConstant(parseState, values)) RETURN_ERROR; paramIndex = _mesa_add_unnamed_constant(parseState->parameters, values, 4, NULL); - ASSERT(swizzle == SWIZZLE_NOOP); srcReg->File = PROGRAM_NAMED_PARAM; srcReg->Index = paramIndex; } @@ -1167,12 +1166,11 @@ Parse_ScalarSrcReg(struct parse_state *parseState, else if (IsDigit(token[0])) { /* scalar literal */ GLfloat values[4]; - GLuint paramIndex, swizzle; + GLuint paramIndex; if (!Parse_ScalarConstant(parseState, values)) RETURN_ERROR; paramIndex = _mesa_add_unnamed_constant(parseState->parameters, values, 4, NULL); - ASSERT(swizzle == SWIZZLE_NOOP); srcReg->Index = paramIndex; srcReg->File = PROGRAM_NAMED_PARAM; needSuffix = GL_FALSE; |