fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 06:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r5xx: Swap sources for CMP.

Browse source 
Follows the same pattern as the op on r3xx/r4xx. Thanks airlied.
This commit is contained in:
Corbin Simpson 2008-05-18 23:52:54 -07:00
parent a6c38f2f64
commit 2708d7f700
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/drivers/dri/r300/r500_fragprog.c
View file

@ -433,27 +433,29 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
| MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[1]));
break;
case OPCODE_CMP:
/* This inst's selects need to be swapped as follows:
* 0 -> C ; 1 -> B ; 2 -> A */
src[0] = make_src(fp, fpi->SrcReg[0]);
src[1] = make_src(fp, fpi->SrcReg[1]);
src[2] = make_src(fp, fpi->SrcReg[2]);
emit_alu(fp, counter, fpi);
fp->inst[counter].inst1 = R500_RGB_ADDR0(src[0])
| R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(src[2]);
fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[0])
| R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(src[2]);
fp->inst[counter].inst1 = R500_RGB_ADDR0(src[2])
| R500_RGB_ADDR1(src[1]) | R500_RGB_ADDR2(src[0]);
fp->inst[counter].inst2 = R500_ALPHA_ADDR0(src[2])
| R500_ALPHA_ADDR1(src[1]) | R500_ALPHA_ADDR2(src[0]);
fp->inst[counter].inst3 = R500_ALU_RGB_SEL_A_SRC0
| MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[0]))
| MAKE_SWIZ_RGB_A(make_rgb_swizzle(fpi->SrcReg[2]))
| R500_ALU_RGB_SEL_B_SRC1 | MAKE_SWIZ_RGB_B(make_rgb_swizzle(fpi->SrcReg[1]));
fp->inst[counter].inst4 = R500_ALPHA_OP_CMP
| R500_ALPHA_ADDRD(dest)
| R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[0]))
| R500_ALPHA_SEL_A_SRC0 | MAKE_SWIZ_ALPHA_A(make_alpha_swizzle(fpi->SrcReg[2]))
| R500_ALPHA_SEL_B_SRC1 | MAKE_SWIZ_ALPHA_B(make_alpha_swizzle(fpi->SrcReg[1]));
fp->inst[counter].inst5 = R500_ALU_RGBA_OP_CMP
| R500_ALU_RGBA_ADDRD(dest)
| R500_ALU_RGBA_SEL_C_SRC2
| MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[2]))
| MAKE_SWIZ_RGBA_C(make_rgb_swizzle(fpi->SrcReg[0]))
| R500_ALU_RGBA_ALPHA_SEL_C_SRC2
| MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[2]));
| MAKE_SWIZ_ALPHA_C(make_alpha_swizzle(fpi->SrcReg[0]));
break;
case OPCODE_COS:
src[0] = make_src(fp, fpi->SrcReg[0]);
@ -805,6 +807,8 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
fp->inst[counter-1].inst0 |= R500_INST_LAST;
} else {
/* We still need to put an output inst, right? */
WARN_ONCE("Final FP instruction is not an OUT.\n");
#if 0
fp->inst[counter].inst0 = R500_INST_TYPE_OUT
| R500_INST_TEX_SEM_WAIT | R500_INST_LAST |
output_mask;
@ -823,6 +827,7 @@ static GLboolean parse_program(struct r500_fragment_program *fp)
| MAKE_SWIZ_RGBA_C(R500_SWIZ_RGB_ZERO)
| MAKE_SWIZ_ALPHA_C(R500_SWIZZLE_ZERO);
counter++;
#endif
}
fp->cs->nrslots = counter;