From: Marek Olšák <maraeo@gmail.com>
Date: Tue, 28 Sep 2010 01:58:23 +0000 (+0200)
Subject: r300/compiler: fix shadow sampling with swizzled coords
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7128e1625bea502b9bf083f14606d679c90222a6;p=mesa.git

r300/compiler: fix shadow sampling with swizzled coords

Taking the W component from coords directly ignores swizzling. Instead,
take the component which is mapped to W in the TEX instruction parameter.
The same for Z.

NOTE: This is a candidate for the 7.9 branch.
---

diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c b/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c
index 09cb8b27f65..de988b7c10c 100644
--- a/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c
+++ b/src/mesa/drivers/dri/r300/compiler/radeon_program_tex.c
@@ -175,17 +175,18 @@ int radeonTransformTEX(
 				inst_rcp->U.I.DstReg.Index = tmp_recip_w;
 				inst_rcp->U.I.DstReg.WriteMask = RC_MASK_W;
 				inst_rcp->U.I.SrcReg[0] = inst->U.I.SrcReg[0];
-				/* XXX do not take W, instead, see which channel is mapped to W. */
-				inst_rcp->U.I.SrcReg[0].Swizzle = RC_SWIZZLE_WWWW;
+				inst_rcp->U.I.SrcReg[0].Swizzle =
+					RC_MAKE_SWIZZLE_SMEAR(GET_SWZ(inst->U.I.SrcReg[0].Swizzle, 3));
 			}
 
-			/* Perspective-divide r by W (if it's TXP) and add the texture sample (see below). */
+			/* Perspective-divide Z by W (if it's TXP) and add the texture sample (see below). */
 			tmp_sum = rc_find_free_temporary(c);
 			inst_mad = rc_insert_new_instruction(c, inst_rcp ? inst_rcp : inst);
 			inst_mad->U.I.DstReg.File = RC_FILE_TEMPORARY;
 			inst_mad->U.I.DstReg.Index = tmp_sum;
 			inst_mad->U.I.SrcReg[0] = inst->U.I.SrcReg[0];
-			inst_mad->U.I.SrcReg[0].Swizzle = RC_SWIZZLE_ZZZZ;
+			inst_mad->U.I.SrcReg[0].Swizzle =
+				RC_MAKE_SWIZZLE_SMEAR(GET_SWZ(inst->U.I.SrcReg[0].Swizzle, 2));
 			if (inst->U.I.Opcode == RC_OPCODE_TXP) {
 				inst_mad->U.I.Opcode = RC_OPCODE_MAD;
 				inst_mad->U.I.SrcReg[1].File = RC_FILE_TEMPORARY;