OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Eric Anholt
2012-10-09 16:59:32 -07:00
parent cc763f0f3f
commit 8058a70763
4 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/main/ffvertex_prog.c
View File

@@ -544,7 +544,6 @@ static void emit_dst( struct prog_dst_register *dst,
dst->WriteMask = mask ? mask : WRITEMASK_XYZW; dst->WriteMask = mask ? mask : WRITEMASK_XYZW;
dst->CondMask = COND_TR; /* always pass cond test */ dst->CondMask = COND_TR; /* always pass cond test */
dst->CondSwizzle = SWIZZLE_NOOP; dst->CondSwizzle = SWIZZLE_NOOP;
dst->CondSrc = 0;
/* Check that bitfield sizes aren't exceeded */ /* Check that bitfield sizes aren't exceeded */
ASSERT(dst->Index == reg.idx); ASSERT(dst->Index == reg.idx);
} }

9
src/mesa/program/prog_instruction.h
View File

@@ -313,15 +313,6 @@ struct prog_dst_register
* Condition code swizzle value. * Condition code swizzle value.
*/ */
GLuint CondSwizzle:12; 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;
/*@}*/
}; };

1
src/mesa/program/prog_optimize.c
View File

@@ -789,7 +789,6 @@ _mesa_remove_extra_moves(struct gl_program *prog)
if (prevInst->DstReg.File == PROGRAM_TEMPORARY && if (prevInst->DstReg.File == PROGRAM_TEMPORARY &&
prevInst->DstReg.Index == id && prevInst->DstReg.Index == id &&
prevInst->DstReg.RelAddr == 0 && prevInst->DstReg.RelAddr == 0 &&
prevInst->DstReg.CondSrc == 0 &&
prevInst->DstReg.CondMask == COND_TR) { prevInst->DstReg.CondMask == COND_TR) {
const GLuint dst_mask = prevInst->DstReg.WriteMask; const GLuint dst_mask = prevInst->DstReg.WriteMask;

5
src/mesa/program/program_parse.y
View File

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