Mesa (master): r600: fix shadow_ambient shader

Andre Maasikas andrem at kemper.freedesktop.org
Mon Jan 18 10:50:08 UTC 2010


Module: Mesa
Branch: master
Commit: 7b82f0f67e4614fc12aee492b0a3cdf5db7391df
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7b82f0f67e4614fc12aee492b0a3cdf5db7391df

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Mon Jan 18 12:42:10 2010 +0200

r600: fix shadow_ambient shader

rtype enums are different, DST_REG_OUTPUT got SRC_REG_CONSTANT in some
shaders and produced invalid output/hang
as TEX output is temp register always set out src to SRC_REG_TEMPORARY

---

 src/mesa/drivers/dri/r600/r700_assembler.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index 0ff16b4..20e165e 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -4469,7 +4469,7 @@ GLboolean assemble_TEX(r700_AssemblerBase *pAsm)
 	}
 	pAsm->D2.dst2.SaturateMode = 1;
 
-	pAsm->S[0].src.rtype = pAsm->D.dst.rtype;
+	pAsm->S[0].src.rtype = SRC_REG_TEMPORARY;
 	pAsm->S[0].src.reg = pAsm->D.dst.reg;
 	noswizzle_PVSSRC(&(pAsm->S[0].src));
 	noneg_PVSSRC(&(pAsm->S[0].src));




More information about the mesa-commit mailing list