Implement LPR in one instruction.

1 files changed, 44 insertions, 135 deletions

diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index f197c0aa..79f2b8e6 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -418,16 +418,16 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 
 		/* FP length. */
 		OUT_VIDEO_REG(R500_US_CODE_ADDR, (R500_US_CODE_START_ADDR(0) |
-							R500_US_CODE_END_ADDR(22)));
+							R500_US_CODE_END_ADDR(19)));
 		OUT_VIDEO_REG(R500_US_CODE_RANGE, (R500_US_CODE_RANGE_ADDR(0) |
-							R500_US_CODE_RANGE_SIZE(22)));
+							R500_US_CODE_RANGE_SIZE(19)));
 
 		/* Prepare for FP emission. */
 		OUT_VIDEO_REG(R500_US_CODE_OFFSET, 0);
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_INDEX, 0);
 		FINISH_VIDEO();
 
-		BEGIN_VIDEO(141);
+		BEGIN_VIDEO(123);
 		/* Pixel shader.
 		 * I've gone ahead and annotated each instruction, since this
 		 * thing is MASSIVE. :3
@@ -930,180 +930,87 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, 0x00000000);
 
 		/* LRP temp3, temp1.zzzz, temp3, temp5 ->
-		 * - PRESUB temps, 1 - temp1.zzzz
-		 * - MUL temp5, temps, temp5
-		 * - MAD temp3, temp1.zzzz, temp3, temp5 */
+		 * - PRESUB temps, temp3 - temp5
+		 * - MAD temp1.zzzz, temps, temp5 */
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_ALU |
 						   R500_INST_TEX_SEM_WAIT |
 						   R500_INST_RGB_WMASK_R |
 						   R500_INST_RGB_WMASK_G |
 						   R500_INST_RGB_WMASK_B |
 						   R500_INST_ALPHA_WMASK));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(3) |
-						   R500_RGB_SRCP_OP_1_MINUS_RGB0 |
-						   R500_RGB_ADDR1(7)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(3) |
-						   R500_ALPHA_SRCP_OP_1_MINUS_A0 |
-						   R500_ALPHA_ADDR1(7)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRCP |
-						   R500_ALU_RGB_R_SWIZ_A_B |
-						   R500_ALU_RGB_G_SWIZ_A_B |
-						   R500_ALU_RGB_B_SWIZ_A_B |
-						   R500_ALU_RGB_SEL_B_SRC1 |
-						   R500_ALU_RGB_R_SWIZ_B_R |
-						   R500_ALU_RGB_G_SWIZ_B_G |
-						   R500_ALU_RGB_B_SWIZ_B_B));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(7) |
-						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRCP |
-						   R500_ALPHA_SWIZ_A_B |
-						   R500_ALPHA_SEL_B_SRC1 |
-						   R500_ALPHA_SWIZ_B_A));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(7) |
-						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_R_SWIZ_0 |
-						   R500_ALU_RGBA_G_SWIZ_0 |
-						   R500_ALU_RGBA_B_SWIZ_0 |
-						   R500_ALU_RGBA_A_SWIZ_0));
-		/* 2nd inst */
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_ALU |
-						   R500_INST_RGB_WMASK_R |
-						   R500_INST_RGB_WMASK_G |
-						   R500_INST_RGB_WMASK_B |
-						   R500_INST_ALPHA_WMASK));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(3) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(7) |
+						   R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 |
 						   R500_RGB_ADDR1(5) |
-						   R500_RGB_ADDR2(7)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(3) |
+						   R500_RGB_ADDR2(3)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(7) |
+						   R500_ALPHA_SRCP_OP_A1_MINUS_A0 |
 						   R500_ALPHA_ADDR1(5) |
-						   R500_ALPHA_ADDR2(7)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC0 |
+						   R500_ALPHA_ADDR1(3)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC2 |
 						   R500_ALU_RGB_R_SWIZ_A_B |
 						   R500_ALU_RGB_G_SWIZ_A_B |
 						   R500_ALU_RGB_B_SWIZ_A_B |
-						   R500_ALU_RGB_SEL_B_SRC1 |
+						   R500_ALU_RGB_SEL_B_SRCP |
 						   R500_ALU_RGB_R_SWIZ_B_R |
 						   R500_ALU_RGB_G_SWIZ_B_G |
 						   R500_ALU_RGB_B_SWIZ_B_B));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(5) |
 						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRC0 |
+						   R500_ALPHA_SEL_A_SRC2 |
 						   R500_ALPHA_SWIZ_A_B |
-						   R500_ALPHA_SEL_B_SRC1 |
+						   R500_ALPHA_SEL_B_SRCP |
 						   R500_ALPHA_SWIZ_B_A));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(5) |
 						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_SEL_C_SRC2 |
+						   R500_ALU_RGBA_SEL_C_SRC0 |
 						   R500_ALU_RGBA_R_SWIZ_R |
 						   R500_ALU_RGBA_G_SWIZ_G |
 						   R500_ALU_RGBA_B_SWIZ_B |
 						   R500_ALU_RGBA_A_SWIZ_A));
 
 		/* LRP temp2, temp1.zzzz, temp2, temp4 ->
-		 * - PRESUB temps, 1 - temp1.zzzz
-		 * - ADD temp4, temps, temp4
-		 * - MAD temp2, temp1.zzzz, temp2, temp4 */
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_ALU |
-						   R500_INST_RGB_WMASK_R |
-						   R500_INST_RGB_WMASK_G |
-						   R500_INST_RGB_WMASK_B |
-						   R500_INST_ALPHA_WMASK));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(3) |
-						   R500_RGB_SRCP_OP_1_MINUS_RGB0 |
-						   R500_RGB_ADDR1(6)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(3) |
-						   R500_ALPHA_SRCP_OP_1_MINUS_A0 |
-						   R500_ALPHA_ADDR1(6)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRCP |
-						   R500_ALU_RGB_R_SWIZ_A_B |
-						   R500_ALU_RGB_G_SWIZ_A_B |
-						   R500_ALU_RGB_B_SWIZ_A_B |
-						   R500_ALU_RGB_SEL_B_SRC1 |
-						   R500_ALU_RGB_R_SWIZ_B_R |
-						   R500_ALU_RGB_G_SWIZ_B_G |
-						   R500_ALU_RGB_B_SWIZ_B_B));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(6) |
-						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRCP |
-						   R500_ALPHA_SWIZ_A_B |
-						   R500_ALPHA_SEL_B_SRC1 |
-						   R500_ALPHA_SWIZ_B_A));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(6) |
-						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_R_SWIZ_0 |
-						   R500_ALU_RGBA_G_SWIZ_0 |
-						   R500_ALU_RGBA_B_SWIZ_0 |
-						   R500_ALU_RGBA_A_SWIZ_0));
-		/* 2nd inst */
+		 * - PRESUB temps, temp2 - temp4
+		 * - MAD temp1.zzzz, temps, temp4 */
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_ALU |
+						   R500_INST_TEX_SEM_WAIT |
 						   R500_INST_RGB_WMASK_R |
 						   R500_INST_RGB_WMASK_G |
 						   R500_INST_RGB_WMASK_B |
 						   R500_INST_ALPHA_WMASK));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(3) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(6) |
+						   R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 |
 						   R500_RGB_ADDR1(4) |
-						   R500_RGB_ADDR2(6)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(3) |
+						   R500_RGB_ADDR2(3)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(6) |
+						   R500_ALPHA_SRCP_OP_A1_MINUS_A0 |
 						   R500_ALPHA_ADDR1(4) |
-						   R500_ALPHA_ADDR2(6)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC0 |
+						   R500_ALPHA_ADDR1(3)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC2 |
 						   R500_ALU_RGB_R_SWIZ_A_B |
 						   R500_ALU_RGB_G_SWIZ_A_B |
 						   R500_ALU_RGB_B_SWIZ_A_B |
-						   R500_ALU_RGB_SEL_B_SRC1 |
+						   R500_ALU_RGB_SEL_B_SRCP |
 						   R500_ALU_RGB_R_SWIZ_B_R |
 						   R500_ALU_RGB_G_SWIZ_B_G |
 						   R500_ALU_RGB_B_SWIZ_B_B));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(4) |
 						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRC0 |
+						   R500_ALPHA_SEL_A_SRC2 |
 						   R500_ALPHA_SWIZ_A_B |
-						   R500_ALPHA_SEL_B_SRC1 |
+						   R500_ALPHA_SEL_B_SRCP |
 						   R500_ALPHA_SWIZ_B_A));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(4) |
 						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_SEL_C_SRC2 |
+						   R500_ALU_RGBA_SEL_C_SRC0 |
 						   R500_ALU_RGBA_R_SWIZ_R |
 						   R500_ALU_RGBA_G_SWIZ_G |
 						   R500_ALU_RGBA_B_SWIZ_B |
 						   R500_ALU_RGBA_A_SWIZ_A));
 
+
 		/* LRP output, temp0.zzzz, temp3, temp2 ->
-		 * - PRESUB temps, 1 - temp0.zzzz
-		 * - MUL temp2, temps, temp2
-		 * - MAD output, temp0.zzzz, temp3, temp2 */
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_ALU |
-						   R500_INST_RGB_WMASK_R |
-						   R500_INST_RGB_WMASK_G |
-						   R500_INST_RGB_WMASK_B |
-						   R500_INST_ALPHA_WMASK));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(2) |
-						   R500_RGB_SRCP_OP_1_MINUS_RGB0 |
-						   R500_RGB_ADDR1(4)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(2) |
-						   R500_ALPHA_SRCP_OP_1_MINUS_A0 |
-						   R500_ALPHA_ADDR1(4)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRCP |
-						   R500_ALU_RGB_R_SWIZ_A_B |
-						   R500_ALU_RGB_G_SWIZ_A_B |
-						   R500_ALU_RGB_B_SWIZ_A_B |
-						   R500_ALU_RGB_SEL_B_SRC1 |
-						   R500_ALU_RGB_R_SWIZ_B_R |
-						   R500_ALU_RGB_G_SWIZ_B_G |
-						   R500_ALU_RGB_B_SWIZ_B_B));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(4) |
-						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRCP |
-						   R500_ALPHA_SWIZ_A_B |
-						   R500_ALPHA_SEL_B_SRC1 |
-						   R500_ALPHA_SWIZ_B_A));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(4) |
-						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_R_SWIZ_0 |
-						   R500_ALU_RGBA_G_SWIZ_0 |
-						   R500_ALU_RGBA_B_SWIZ_0 |
-						   R500_ALU_RGBA_A_SWIZ_0));
-		/* 2nd inst */
+		 * - PRESUB temps, temp3 - temp2
+		 * - MAD temp0.zzzz, temps, temp2 */
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_OUT |
 						   R500_INST_LAST |
 						   R500_INST_TEX_SEM_WAIT |
@@ -1115,29 +1022,31 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   R500_INST_RGB_OMASK_G |
 						   R500_INST_RGB_OMASK_B |
 						   R500_INST_ALPHA_OMASK));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(2) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(4) |
+						   R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 |
 						   R500_RGB_ADDR1(5) |
-						   R500_RGB_ADDR2(4)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(2) |
+						   R500_RGB_ADDR2(2)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(4) |
+						   R500_ALPHA_SRCP_OP_A1_MINUS_A0 |
 						   R500_ALPHA_ADDR1(5) |
-						   R500_ALPHA_ADDR2(4)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC0 |
+						   R500_ALPHA_ADDR1(2)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC2 |
 						   R500_ALU_RGB_R_SWIZ_A_B |
 						   R500_ALU_RGB_G_SWIZ_A_B |
 						   R500_ALU_RGB_B_SWIZ_A_B |
-						   R500_ALU_RGB_SEL_B_SRC1 |
+						   R500_ALU_RGB_SEL_B_SRCP |
 						   R500_ALU_RGB_R_SWIZ_B_R |
 						   R500_ALU_RGB_G_SWIZ_B_G |
 						   R500_ALU_RGB_B_SWIZ_B_B));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(0) |
 						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRC0 |
+						   R500_ALPHA_SEL_A_SRC2 |
 						   R500_ALPHA_SWIZ_A_B |
-						   R500_ALPHA_SEL_B_SRC1 |
+						   R500_ALPHA_SEL_B_SRCP |
 						   R500_ALPHA_SWIZ_B_A));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(0) |
 						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_SEL_C_SRC2 |
+						   R500_ALU_RGBA_SEL_C_SRC0 |
 						   R500_ALU_RGBA_R_SWIZ_R |
 						   R500_ALU_RGBA_G_SWIZ_G |
 						   R500_ALU_RGBA_B_SWIZ_B |