summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-04-20 11:54:30 -0600
committerBrian <brian@yutani.localnet.net>2007-04-21 10:05:05 -0600
commit257f799849a1eb3e81851b92a8fd27efa8f93d47 (patch)
tree4c708f3fe62b5ca7c512c040facb7587fcaf8dbc
parent81c4fee160cd2840caf77bbdbf462e783911141a (diff)
downloadmesa-257f799849a1eb3e81851b92a8fd27efa8f93d47.tar.gz
remove more unused vars, assertions
-rw-r--r--src/mesa/shader/nvfragparse.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 02da3ade7df..0f1a1eade4a 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1036,25 +1036,23 @@ Parse_VectorSrc(struct parse_state *parseState,
else if (IsDigit(token[0]) || token[0] == '-' || token[0] == '+' || token[0] == '.'){
/* literal scalar constant */
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->File = PROGRAM_NAMED_PARAM;
srcReg->Index = paramIndex;
}
else if (token[0] == '{'){
/* literal vector constant */
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;
}