mesa: Remove prog_instruction.h field for never-supported NV_vertex_program3.

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 0a98c4acf86c453e24dd940f739ffc648fbb098f..efdca015e99c7407a3c5d2a2cf08ba9dfa58359c 100644 (file)
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -544,7 +544,6 @@ static void emit_dst( struct prog_dst_register *dst,
    dst->WriteMask = mask ? mask : WRITEMASK_XYZW;
    dst->CondMask = COND_TR;  /* always pass cond test */
    dst->CondSwizzle = SWIZZLE_NOOP;
-   dst->CondSrc = 0;
    /* Check that bitfield sizes aren't exceeded */
    ASSERT(dst->Index == reg.idx);
 }

diff --git a/src/mesa/program/prog_instruction.h b/src/mesa/program/prog_instruction.h
index 7c09cdabf0feddc2fec8d3290a6c3d3904b8e818..569294e92bfc47c9d27e1fb7809d01b045ad6a2d 100644 (file)
--- a/src/mesa/program/prog_instruction.h
+++ b/src/mesa/program/prog_instruction.h
@@ -313,15 +313,6 @@ struct prog_dst_register
     * Condition code swizzle value.
     */
    GLuint CondSwizzle:12;
-
-   /**
-    * Selects the condition code register to use for conditional destination
-    * update masking.  In NV_fragmnet_program or NV_vertex_program2 mode, only
-    * condition code register 0 is available.  In NV_vertex_program3 mode,
-    * condition code registers 0 and 1 are available.
-    */
-   GLuint CondSrc:1;
-   /*@}*/
 };
 
 

diff --git a/src/mesa/program/prog_optimize.c b/src/mesa/program/prog_optimize.c
index 78d09f1cbe1f1d64269a5659111711fb75619124..c1013a5a2af2c257fb3862451fe40aa6954bc87e 100644 (file)
--- a/src/mesa/program/prog_optimize.c
+++ b/src/mesa/program/prog_optimize.c
@@ -789,7 +789,6 @@ _mesa_remove_extra_moves(struct gl_program *prog)
             if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&
                 prevInst->DstReg.Index == id &&
                 prevInst->DstReg.RelAddr == 0 &&
-                prevInst->DstReg.CondSrc == 0 && 
                 prevInst->DstReg.CondMask == COND_TR) {
 
                const GLuint dst_mask = prevInst->DstReg.WriteMask;

diff --git a/src/mesa/program/program_parse.y b/src/mesa/program/program_parse.y
index 54b17314a3ac648504424677c5494add524f8baa..759c9ecd007c0c74e2b4aade44e19e48dc320994 100644 (file)
--- a/src/mesa/program/program_parse.y
+++ b/src/mesa/program/program_parse.y
@@ -468,7 +468,6 @@ KIL_instruction: KIL swizzleSrcReg
           $$ = asm_instruction_ctor(OPCODE_KIL_NV, NULL, NULL, NULL, NULL);
           $$->Base.DstReg.CondMask = $2.CondMask;
           $$->Base.DstReg.CondSwizzle = $2.CondSwizzle;
-          $$->Base.DstReg.CondSrc = $2.CondSrc;
           state->fragment.UsesKill = 1;
        }
        ;
@@ -637,7 +636,6 @@ maskedDstReg: dstReg optionalMask optionalCcMask
           $$.WriteMask = $2.mask;
           $$.CondMask = $3.CondMask;
           $$.CondSwizzle = $3.CondSwizzle;
-          $$.CondSrc = $3.CondSrc;
 
           if ($$.File == PROGRAM_OUTPUT) {
              /* Technically speaking, this should check that it is in
@@ -1030,7 +1028,6 @@ optionalCcMask: '(' ccTest ')'
        {
           $$.CondMask = COND_TR;
           $$.CondSwizzle = SWIZZLE_NOOP;
-          $$.CondSrc = 0;
        }
        ;
 
@@ -1067,7 +1064,6 @@ ccMaskRule: IDENTIFIER
 
           $$.CondMask = cond;
           $$.CondSwizzle = SWIZZLE_NOOP;
-          $$.CondSrc = 0;
        }
        ;
 
@@ -1090,7 +1086,6 @@ ccMaskRule2: USED_IDENTIFIER
 
           $$.CondMask = cond;
           $$.CondSwizzle = SWIZZLE_NOOP;
-          $$.CondSrc = 0;
        }
        ;