diff options
| -rw-r--r-- | src/mesa/main/nvfragparse.c | 15 | ||||
| -rw-r--r-- | src/mesa/main/nvvertparse.c | 8 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/mesa/main/nvfragparse.c b/src/mesa/main/nvfragparse.c index 37a5559789b..c2023785e5c 100644 --- a/src/mesa/main/nvfragparse.c +++ b/src/mesa/main/nvfragparse.c @@ -52,6 +52,13 @@ #define OUTPUT_S 21 #define OUTPUT_NONE 22 +/* IRIX defines some of these */ +#undef _R +#undef _H +#undef _X +#undef _C +#undef _S + /* Optional suffixes */ #define _R FLOAT32 /* float */ #define _H FLOAT16 /* half-float */ @@ -1249,10 +1256,10 @@ Parse_InstructionSequence(struct parse_state *parseState, GLubyte token[100]; /* Initialize the instruction */ - inst->SrcReg[0].File = -1; - inst->SrcReg[1].File = -1; - inst->SrcReg[2].File = -1; - inst->DstReg.File = -1; + inst->SrcReg[0].File = (enum register_file) -1; + inst->SrcReg[1].File = (enum register_file) -1; + inst->SrcReg[2].File = (enum register_file) -1; + inst->DstReg.File = (enum register_file) -1; inst->DstReg.CondSwizzle[0] = 0; inst->DstReg.CondSwizzle[1] = 1; inst->DstReg.CondSwizzle[2] = 2; diff --git a/src/mesa/main/nvvertparse.c b/src/mesa/main/nvvertparse.c index 4078fd864f2..fd99a261f0b 100644 --- a/src/mesa/main/nvvertparse.c +++ b/src/mesa/main/nvvertparse.c @@ -1034,10 +1034,10 @@ Parse_InstructionSequence(struct parse_state *parseState, struct vp_instruction *inst = program + parseState->numInst; /* Initialize the instruction */ - inst->SrcReg[0].File = -1; - inst->SrcReg[1].File = -1; - inst->SrcReg[2].File = -1; - inst->DstReg.File = -1; + inst->SrcReg[0].File = (enum register_file) -1; + inst->SrcReg[1].File = (enum register_file) -1; + inst->SrcReg[2].File = (enum register_file) -1; + inst->DstReg.File = (enum register_file) -1; if (Parse_String(parseState, "MOV")) { if (!Parse_UnaryOpInstruction(parseState, inst, VP_OPCODE_MOV)) |