Define new NEGATE_* tokens for setting the src register's NegateBase field.

Before, we were using GL_TRUE/GL_FALSE in a few places.
Note: only the SWZ instruction can negate individual components.
This commit is contained in:
Brian Paul
2006-05-30 22:17:35 +00:00
parent e4cb9cd167
commit a8c4242395
3 changed files with 30 additions and 17 deletions

View File

@@ -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 = 0xf;
srcReg->NegateBase = NEGATE_XYZW;
else if (Parse_String(parseState, "+"))
srcReg->NegateBase = 0;
srcReg->NegateBase = NEGATE_NONE;
else
srcReg->NegateBase = 0;
srcReg->NegateBase = NEGATE_NONE;
}
else {
srcReg->Abs = GL_FALSE;
srcReg->NegateAbs = GL_FALSE;
srcReg->NegateBase = (sign < 0.0F) ? 0xf : 0x0;
srcReg->NegateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
}
/* 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 = 0xf;
srcReg->NegateBase = NEGATE_XYZW;
else if (Parse_String(parseState, "+"))
srcReg->NegateBase = 0x0;
srcReg->NegateBase = NEGATE_NONE;
else
srcReg->NegateBase = 0x0;
srcReg->NegateBase = NEGATE_NONE;
}
else {
srcReg->Abs = GL_FALSE;
srcReg->NegateAbs = GL_FALSE;
srcReg->NegateBase = (sign < 0.0F) ? 0xf : 0x0;
srcReg->NegateBase = (sign < 0.0F) ? NEGATE_XYZW : NEGATE_NONE;
}
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 = 0x0;
inst->SrcReg[0].NegateBase = NEGATE_NONE;
inst->SrcReg[0].Abs = GL_FALSE;
inst->SrcReg[0].NegateAbs = GL_FALSE;