parser: Initialize unused instruction source registers
authorIan Romanick <ian.d.romanick@intel.com>
Wed, 22 Jul 2009 19:29:48 +0000 (12:29 -0700)
committerIan Romanick <ian.d.romanick@intel.com>
Wed, 22 Jul 2009 19:29:48 +0000 (12:29 -0700)
The 965 driver expects unused source registers (e.g., SrcReg[2] of a
DP3 instruction) to have a register file of PROGRAM_UNDEFINED.
Initializing these source registers ensures that this happens.

src/mesa/shader/program_parse.tab.c
src/mesa/shader/program_parse.y

index bf48b97..cb5fa7c 100644 (file)
@@ -4558,11 +4558,15 @@ asm_instruction_ctor(gl_inst_opcode op,
       if (src1 != NULL) {
         inst->Base.SrcReg[1] = src1->Base;
         inst->SrcReg[1] = *src1;
+      } else {
+        init_src_reg(& inst->SrcReg[1]);
       }
 
       if (src2 != NULL) {
         inst->Base.SrcReg[2] = src2->Base;
         inst->SrcReg[2] = *src2;
+      } else {
+        init_src_reg(& inst->SrcReg[2]);
       }
    }
 
index 0260196..fe9022b 100644 (file)
@@ -1774,11 +1774,15 @@ asm_instruction_ctor(gl_inst_opcode op,
       if (src1 != NULL) {
         inst->Base.SrcReg[1] = src1->Base;
         inst->SrcReg[1] = *src1;
+      } else {
+        init_src_reg(& inst->SrcReg[1]);
       }
 
       if (src2 != NULL) {
         inst->Base.SrcReg[2] = src2->Base;
         inst->SrcReg[2] = *src2;
+      } else {
+        init_src_reg(& inst->SrcReg[2]);
       }
    }