diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2006-05-30 22:20:43 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2006-05-30 22:20:43 +0000 |
| commit | 9ba26c97dbd2d628e987b08de18e505a4f29e036 (patch) | |
| tree | 71066530bc3e9ca9857e778410d44c29e6b210a0 | |
| parent | 6faefc12cc4b94578546125ef31d2d200d494089 (diff) | |
Set NegateBase field to 0x0 or 0xf instead of GL_FALSE/GL_TRUE since it's
a per-component field. This is done a little nicer on the trunk.
| -rw-r--r-- | src/mesa/shader/nvfragparse.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c index cbf0a0d2b7..9cf4b13e96 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 = 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; } /* 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)) @@ -1242,7 +1242,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; |