R3xx/R5xx: enable VS for mask texture

1 files changed, 34 insertions, 15 deletions

diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 58be88c8..dc717c29 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -1124,7 +1124,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 	OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_1,
 		      ((R300_DATA_TYPE_FLOAT_2 << R300_DATA_TYPE_2_SHIFT) |
 		       (0 << R300_SKIP_DWORDS_2_SHIFT) |
-		       (11 << R300_DST_VEC_LOC_2_SHIFT) |
+		       (14 << R300_DST_VEC_LOC_2_SHIFT) |
 		       R300_LAST_VEC_2 |
 		       R300_SIGNED_2));
 	OUT_ACCEL_REG(R300_VAP_PROG_STREAM_CNTL_EXT_0,
@@ -1188,7 +1188,7 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 
     /* setup the vertex shader */
     if (has_tcl) {
-	if (0/*pMask*/) {
+	if (pMask) {
 	    BEGIN_ACCEL(21);
 	    OUT_ACCEL_REG(R300_VAP_PVS_CODE_CNTL_0,
 			  ((0 << R300_PVS_FIRST_INST_SHIFT) |
@@ -1207,14 +1207,12 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 	}
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_INDX_REG, 0);
 	/* PVS inst 0 */
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00f00203);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_DST_OPCODE(R300_VE_ADD) |
 		       R300_PVS_DST_REG_TYPE(R300_PVS_DST_REG_OUT) |
 		       R300_PVS_DST_OFFSET(0) |
 		       R300_PVS_DST_WE_X | R300_PVS_DST_WE_Y |
 		       R300_PVS_DST_WE_Z | R300_PVS_DST_WE_W));
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00d10001);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
 		       R300_PVS_SRC_OFFSET(0) |
@@ -1222,7 +1220,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 		       R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_Y) |
 		       R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_Z) |
 		       R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_W)));
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248001);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
 		       R300_PVS_SRC_OFFSET(0) |
@@ -1230,7 +1227,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 		       R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_FORCE_0) |
 		       R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_FORCE_0) |
 		       R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_FORCE_0)));
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248001);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
 		       R300_PVS_SRC_OFFSET(0) |
@@ -1240,14 +1236,12 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 		       R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_FORCE_0)));
 
 	/* PVS inst 1 */
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00f02203);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_DST_OPCODE(R300_VE_ADD) |
 		       R300_PVS_DST_REG_TYPE(R300_PVS_DST_REG_OUT) |
 		       R300_PVS_DST_OFFSET(1) |
 		       R300_PVS_DST_WE_X | R300_PVS_DST_WE_Y |
 		       R300_PVS_DST_WE_Z | R300_PVS_DST_WE_W));
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00d10141);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
 		       R300_PVS_SRC_OFFSET(10) |
@@ -1255,7 +1249,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 		       R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_Y) |
 		       R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_Z) |
 		       R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_W)));
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248141);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
 		       R300_PVS_SRC_OFFSET(10) |
@@ -1263,7 +1256,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 		       R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_FORCE_0) |
 		       R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_FORCE_0) |
 		       R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_FORCE_0)));
-	//OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248141);
 	OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
 		      (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
 		       R300_PVS_SRC_OFFSET(10) |
@@ -1272,12 +1264,39 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
 		       R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_FORCE_0) |
 		       R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_FORCE_0)));
 
-	if (0/*pMask*/) {
+	if (pMask) {
 	    /* PVS inst 2 */
-	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00f04203);
-	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00d10141);
-	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248141);
-	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248141);
+	    //OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00f04203);
+	    //OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x00d10141);
+	    //OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248141);
+	    //OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,0x01248141);
+	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
+			  (R300_PVS_DST_OPCODE(R300_VE_ADD) |
+			   R300_PVS_DST_REG_TYPE(R300_PVS_DST_REG_OUT) |
+			   R300_PVS_DST_OFFSET(2) |
+			   R300_PVS_DST_WE_X | R300_PVS_DST_WE_Y |
+			   R300_PVS_DST_WE_Z | R300_PVS_DST_WE_W));
+	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
+			  (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
+			   R300_PVS_SRC_OFFSET(14) |
+			   R300_PVS_SRC_SWIZZLE_X(R300_PVS_SRC_SELECT_X) |
+			   R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_Y) |
+			   R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_Z) |
+			   R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_W)));
+	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
+			  (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
+			   R300_PVS_SRC_OFFSET(14) |
+			   R300_PVS_SRC_SWIZZLE_X(R300_PVS_SRC_SELECT_FORCE_0) |
+			   R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_FORCE_0) |
+			   R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_FORCE_0) |
+			   R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_FORCE_0)));
+	    OUT_ACCEL_REG(R300_VAP_PVS_VECTOR_DATA_REG,
+			  (R300_PVS_SRC_REG_TYPE(R300_PVS_SRC_REG_INPUT) |
+			   R300_PVS_SRC_OFFSET(14) |
+			   R300_PVS_SRC_SWIZZLE_X(R300_PVS_SRC_SELECT_FORCE_0) |
+			   R300_PVS_SRC_SWIZZLE_Y(R300_PVS_SRC_SELECT_FORCE_0) |
+			   R300_PVS_SRC_SWIZZLE_Z(R300_PVS_SRC_SELECT_FORCE_0) |
+			   R300_PVS_SRC_SWIZZLE_W(R300_PVS_SRC_SELECT_FORCE_0)));
 	}
 
 	OUT_ACCEL_REG(R300_VAP_PVS_FLOW_CNTL_OPC, 0);