Move some ALU instructions after the TEX instructions, so we can do something usefull while we are waiting for the texture values.

1 files changed, 89 insertions, 90 deletions

diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
index d436c03d..88b4f2af 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
@@ -514,42 +514,6 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   R500_ALU_RGBA_B_SWIZ_0 |
 						   R500_ALU_RGBA_A_SWIZ_0));
 
-		/* MAD temp4, const1, temp1.yyyy, 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(0) |
-						   R500_RGB_ADDR0_CONST |
-						   R500_RGB_ADDR1(5) |
-						   R500_RGB_ADDR2(4)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(0) |
-						   R500_ALPHA_ADDR0_CONST |
-						   R500_ALPHA_ADDR1(5) |
-						   R500_ALPHA_ADDR2(4)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC0 |
-						   R500_ALU_RGB_R_SWIZ_A_0 |
-						   R500_ALU_RGB_G_SWIZ_A_G |
-						   R500_ALU_RGB_B_SWIZ_A_0 |
-						   R500_ALU_RGB_SEL_B_SRC1 |
-						   R500_ALU_RGB_R_SWIZ_B_G |
-						   R500_ALU_RGB_G_SWIZ_B_G |
-						   R500_ALU_RGB_B_SWIZ_B_G));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(1) |
-						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SEL_A_SRC0 |
-						   R500_ALPHA_SWIZ_A_G |
-						   R500_ALPHA_SEL_B_SRC1 |
-						   R500_ALPHA_SWIZ_B_G));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(1) |
-						   R500_ALU_RGBA_OP_MAD |
-						   R500_ALU_RGBA_SEL_C_SRC2 |
-						   R500_ALU_RGBA_R_SWIZ_R |
-						   R500_ALU_RGBA_G_SWIZ_G |
-						   R500_ALU_RGBA_B_SWIZ_B |
-						   R500_ALU_RGBA_A_SWIZ_A));
-
 		/* MAD temp2, const1, temp1.xxxx, temp2 */
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_ALU |
 						   R500_INST_RGB_WMASK_R |
@@ -572,13 +536,13 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   R500_ALU_RGB_R_SWIZ_B_R |
 						   R500_ALU_RGB_G_SWIZ_B_R |
 						   R500_ALU_RGB_B_SWIZ_B_R));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(4) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(3) |
 						   R500_ALPHA_OP_MAD |
 						   R500_ALPHA_SEL_A_SRC0 |
 						   R500_ALPHA_SWIZ_A_G |
 						   R500_ALPHA_SEL_B_SRC1 |
 						   R500_ALPHA_SWIZ_B_R));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(4) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(3) |
 						   R500_ALU_RGBA_OP_MAD |
 						   R500_ALU_RGBA_SEL_C_SRC2 |
 						   R500_ALU_RGBA_R_SWIZ_R |
@@ -603,42 +567,12 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   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) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(3) |
 						   R500_ALPHA_OP_MAD |
 						   R500_ALPHA_SWIZ_A_1 |
 						   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_SEL_C_SRC2 |
-						   R500_ALU_RGBA_R_SWIZ_R |
-						   R500_ALU_RGBA_G_SWIZ_G |
-						   R500_ALU_RGBA_B_SWIZ_R |
-						   R500_ALU_RGBA_A_SWIZ_G));
-
-		/* ADD temp4, temp4, input0 */
-		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_ADDR1(1) |
-						   R500_RGB_ADDR2(0)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR1(1) |
-						   R500_ALPHA_ADDR2(0)));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_R_SWIZ_A_1 |
-						   R500_ALU_RGB_G_SWIZ_A_1 |
-						   R500_ALU_RGB_B_SWIZ_A_1 |
-						   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(0) |
-						   R500_ALPHA_OP_MAD |
-						   R500_ALPHA_SWIZ_A_1 |
-						   R500_ALPHA_SEL_B_SRC1 |
-						   R500_ALPHA_SWIZ_B_A));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(0) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(3) |
 						   R500_ALU_RGBA_OP_MAD |
 						   R500_ALU_RGBA_SEL_C_SRC2 |
 						   R500_ALU_RGBA_R_SWIZ_R |
@@ -655,7 +589,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_ID(0) |
 						   R500_TEX_INST_LD |
 						   R500_TEX_IGNORE_UNCOVERED));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_SRC_ADDR(4) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_SRC_ADDR(3) |
 						   R500_TEX_SRC_S_SWIZ_B |
 						   R500_TEX_SRC_T_SWIZ_A |
 						   R500_TEX_SRC_R_SWIZ_R |
@@ -669,7 +603,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, 0x00000000);
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, 0x00000000);
 
-		/* TEX temp5, temp5, tex0, 1D */
+		/* TEX temp2, temp2, tex0, 1D */
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_TEX |
 						   R500_INST_TEX_SEM_WAIT |
 						   R500_INST_RGB_WMASK_R |
@@ -680,9 +614,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   R500_TEX_INST_LD |
 						   R500_TEX_SEM_ACQUIRE |
 						   R500_TEX_IGNORE_UNCOVERED));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_SRC_ADDR(0) |
-						   R500_TEX_SRC_S_SWIZ_B |
-						   R500_TEX_SRC_T_SWIZ_A |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_SRC_ADDR(3) |
+						   R500_TEX_SRC_S_SWIZ_R |
+						   R500_TEX_SRC_T_SWIZ_G |
 						   R500_TEX_SRC_R_SWIZ_B |
 						   R500_TEX_SRC_Q_SWIZ_A |
 						   R500_TEX_DST_ADDR(3) |
@@ -694,7 +628,73 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, 0x00000000);
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, 0x00000000);
 
-		/* TEX temp2, temp2, tex0, 1D */
+		/* MAD temp4, const1, temp1.yyyy, 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(0) |
+						   R500_RGB_ADDR0_CONST |
+						   R500_RGB_ADDR1(5) |
+						   R500_RGB_ADDR2(4)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(0) |
+						   R500_ALPHA_ADDR0_CONST |
+						   R500_ALPHA_ADDR1(5) |
+						   R500_ALPHA_ADDR2(4)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_SEL_A_SRC0 |
+						   R500_ALU_RGB_R_SWIZ_A_0 |
+						   R500_ALU_RGB_G_SWIZ_A_G |
+						   R500_ALU_RGB_B_SWIZ_A_0 |
+						   R500_ALU_RGB_SEL_B_SRC1 |
+						   R500_ALU_RGB_R_SWIZ_B_G |
+						   R500_ALU_RGB_G_SWIZ_B_G |
+						   R500_ALU_RGB_B_SWIZ_B_G));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(4) |
+						   R500_ALPHA_OP_MAD |
+						   R500_ALPHA_SEL_A_SRC0 |
+						   R500_ALPHA_SWIZ_A_G |
+						   R500_ALPHA_SEL_B_SRC1 |
+						   R500_ALPHA_SWIZ_B_G));
+		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_R_SWIZ_R |
+						   R500_ALU_RGBA_G_SWIZ_G |
+						   R500_ALU_RGBA_B_SWIZ_B |
+						   R500_ALU_RGBA_A_SWIZ_A));
+
+		/* ADD temp4, temp4, input0 */
+		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_ADDR1(4) |
+						   R500_RGB_ADDR2(0)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR1(4) |
+						   R500_ALPHA_ADDR2(0)));
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGB_R_SWIZ_A_1 |
+						   R500_ALU_RGB_G_SWIZ_A_1 |
+						   R500_ALU_RGB_B_SWIZ_A_1 |
+						   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(0) |
+						   R500_ALPHA_OP_MAD |
+						   R500_ALPHA_SWIZ_A_1 |
+						   R500_ALPHA_SEL_B_SRC1 |
+						   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_R_SWIZ_R |
+						   R500_ALU_RGBA_G_SWIZ_G |
+						   R500_ALU_RGBA_B_SWIZ_R |
+						   R500_ALU_RGBA_A_SWIZ_G));
+
+		/* TEX temp5, temp5, tex0, 1D */
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_INST_TYPE_TEX |
 						   R500_INST_TEX_SEM_WAIT |
 						   R500_INST_RGB_WMASK_R |
@@ -704,9 +704,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_ID(0) |
 						   R500_TEX_INST_LD |
 						   R500_TEX_IGNORE_UNCOVERED));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_SRC_ADDR(4) |
-						   R500_TEX_SRC_S_SWIZ_R |
-						   R500_TEX_SRC_T_SWIZ_G |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_TEX_SRC_ADDR(0) |
+						   R500_TEX_SRC_S_SWIZ_B |
+						   R500_TEX_SRC_T_SWIZ_A |
 						   R500_TEX_SRC_R_SWIZ_B |
 						   R500_TEX_SRC_Q_SWIZ_A |
 						   R500_TEX_DST_ADDR(4) |
@@ -754,11 +754,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(3) |
 						   R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 |
 						   R500_RGB_ADDR1(1) |
-						   R500_RGB_ADDR2(5)));
+						   R500_RGB_ADDR2(2)));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(3) |
 						   R500_ALPHA_SRCP_OP_A1_MINUS_A0 |
 						   R500_ALPHA_ADDR1(1) |
-						   R500_ALPHA_ADDR1(5)));
+						   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 |
@@ -767,13 +767,13 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   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(1) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDRD(3) |
 						   R500_ALPHA_OP_MAD |
 						   R500_ALPHA_SEL_A_SRC2 |
 						   R500_ALPHA_SWIZ_A_B |
 						   R500_ALPHA_SEL_B_SRCP |
 						   R500_ALPHA_SWIZ_B_A));
-		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(1) |
+		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALU_RGBA_ADDRD(3) |
 						   R500_ALU_RGBA_OP_MAD |
 						   R500_ALU_RGBA_SEL_C_SRC0 |
 						   R500_ALU_RGBA_R_SWIZ_R |
@@ -793,11 +793,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(0) |
 						   R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 |
 						   R500_RGB_ADDR1(4) |
-						   R500_RGB_ADDR2(5)));
+						   R500_RGB_ADDR2(2)));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(0) |
 						   R500_ALPHA_SRCP_OP_A1_MINUS_A0 |
 						   R500_ALPHA_ADDR1(4) |
-						   R500_ALPHA_ADDR1(5)));
+						   R500_ALPHA_ADDR2(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 |
@@ -820,7 +820,6 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   R500_ALU_RGBA_B_SWIZ_B |
 						   R500_ALU_RGBA_A_SWIZ_A));
 
-
 		/* LRP output, temp0.zzzz, temp3, temp2 ->
 		 * - PRESUB temps, temp3 - temp2
 		 * - MAD temp0.zzzz, temps, temp2 */
@@ -837,12 +836,12 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
 						   R500_INST_ALPHA_OMASK));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_RGB_ADDR0(0) |
 						   R500_RGB_SRCP_OP_RGB1_MINUS_RGB0 |
-						   R500_RGB_ADDR1(1) |
-						   R500_RGB_ADDR2(2)));
+						   R500_RGB_ADDR1(3) |
+						   R500_RGB_ADDR2(5)));
 		OUT_VIDEO_REG(R500_GA_US_VECTOR_DATA, (R500_ALPHA_ADDR0(0) |
 						   R500_ALPHA_SRCP_OP_A1_MINUS_A0 |
-						   R500_ALPHA_ADDR1(1) |
-						   R500_ALPHA_ADDR1(2)));
+						   R500_ALPHA_ADDR1(3) |
+						   R500_ALPHA_ADDR2(5)));
 		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 |