summaryrefslogtreecommitdiffstats
path: root/src/mesa/shader/nvfragparse.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2005-09-08 18:35:48 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2005-09-08 18:35:48 +0000
commit5cf13977106d9d7b75da0621a1a2c0bc299f4b3a (patch)
tree6e68695d0b83c3b1fc3ff73dc7c3fb0d46031b46 /src/mesa/shader/nvfragparse.c
parent4618a9bfc2cd57c47ddf3590782c751ec194d362 (diff)
downloadexternal_mesa3d-5cf13977106d9d7b75da0621a1a2c0bc299f4b3a.zip
external_mesa3d-5cf13977106d9d7b75da0621a1a2c0bc299f4b3a.tar.gz
external_mesa3d-5cf13977106d9d7b75da0621a1a2c0bc299f4b3a.tar.bz2
be consistent in populating NegateBase field
Diffstat (limited to 'src/mesa/shader/nvfragparse.c')
-rw-r--r--src/mesa/shader/nvfragparse.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index c967b81..17dd42b 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -983,16 +983,16 @@ Parse_VectorSrc(struct parse_state *parseState,
srcReg->NegateAbs = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
if (Parse_String(parseState, "-"))
- srcReg->NegateBase = GL_TRUE;
+ srcReg->NegateBase = 0xf;
else if (Parse_String(parseState, "+"))
- srcReg->NegateBase = GL_FALSE;
+ srcReg->NegateBase = 0;
else
- srcReg->NegateBase = GL_FALSE;
+ srcReg->NegateBase = 0;
}
else {
srcReg->Abs = GL_FALSE;
srcReg->NegateAbs = GL_FALSE;
- srcReg->NegateBase = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+ srcReg->NegateBase = (sign < 0.0F) ? 0xf : 0x0;
}
/* This should be the real src vector/register name */
@@ -1107,16 +1107,16 @@ Parse_ScalarSrcReg(struct parse_state *parseState,
srcReg->NegateAbs = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
if (Parse_String(parseState, "-"))
- srcReg->NegateBase = GL_TRUE;
+ srcReg->NegateBase = 0xf;
else if (Parse_String(parseState, "+"))
- srcReg->NegateBase = GL_FALSE;
+ srcReg->NegateBase = 0x0;
else
- srcReg->NegateBase = GL_FALSE;
+ srcReg->NegateBase = 0x0;
}
else {
srcReg->Abs = GL_FALSE;
srcReg->NegateAbs = GL_FALSE;
- srcReg->NegateBase = (sign < 0.0F) ? GL_TRUE : GL_FALSE;
+ srcReg->NegateBase = (sign < 0.0F) ? 0xf : 0x0;
}
if (!Peek_Token(parseState, token))
@@ -1241,7 +1241,7 @@ Parse_PrintInstruction(struct parse_state *parseState,
}
inst->SrcReg[0].Swizzle = SWIZZLE_NOOP;
- inst->SrcReg[0].NegateBase = GL_FALSE;
+ inst->SrcReg[0].NegateBase = 0x0;
inst->SrcReg[0].Abs = GL_FALSE;
inst->SrcReg[0].NegateAbs = GL_FALSE;