Mesa (r6xx-r7xx-support): R6xx/7xx: Fix blinn's lighting shader
Cooper Yuan
cooperyuan at kemper.freedesktop.org
Thu May 21 09:01:54 UTC 2009
Module: Mesa
Branch: r6xx-r7xx-support
Commit: 8669a81d98df2ec689b9b2e6d52e0e8c1048caeb
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8669a81d98df2ec689b9b2e6d52e0e8c1048caeb
Author: Cooper Yuan <cooperyuan at gmail.com>
Date: Thu May 21 16:56:00 2009 +0800
R6xx/7xx: Fix blinn's lighting shader
---
src/mesa/drivers/dri/r600/r700_assembler.c | 39 +++++++++++++--------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/src/mesa/drivers/dri/r600/r700_assembler.c b/src/mesa/drivers/dri/r600/r700_assembler.c
index ac9487c..3026caa 100644
--- a/src/mesa/drivers/dri/r600/r700_assembler.c
+++ b/src/mesa/drivers/dri/r600/r700_assembler.c
@@ -2883,15 +2883,15 @@ GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
return GL_FALSE;
}
- /* dst.w = log(src.y) */
+ /* dst.z = log(src.y) */
pAsm->D.dst.opcode = SQ_OP2_INST_LOG_CLAMPED;
pAsm->D.dst.math = 1;
pAsm->D.dst.rtype = dstType;
pAsm->D.dst.reg = dstReg;
pAsm->D.dst.writex = 0;
pAsm->D.dst.writey = 0;
- pAsm->D.dst.writez = 0;
- pAsm->D.dst.writew = 1;
+ pAsm->D.dst.writez = 1;
+ pAsm->D.dst.writew = 0;
pAsm->S[0].src.rtype = srcType;
pAsm->S[0].src.reg = srcReg;
setaddrmode_PVSSRC(&(pAsm->S[0].src), ADDR_ABSOLUTE);
@@ -2905,15 +2905,15 @@ GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
return GL_FALSE;
}
- /* tmp.x = amd MUL_LIT(src.w, dst.w, src.x ) */
+ /* dst.w = MUL_LIT(src.w, dst.z, src.x ) */
pAsm->D.dst.opcode = SQ_OP3_INST_MUL_LIT;
pAsm->D.dst.op3 = 1;
- pAsm->D.dst.rtype = DST_REG_TEMPORARY;
- pAsm->D.dst.reg = tmp;
- pAsm->D.dst.writex = 1;
+ pAsm->D.dst.rtype = dstType;
+ pAsm->D.dst.reg = dstReg;
+ pAsm->D.dst.writex = 0;
pAsm->D.dst.writey = 0;
pAsm->D.dst.writez = 0;
- pAsm->D.dst.writew = 0;
+ pAsm->D.dst.writew = 1;
pAsm->S[0].src.rtype = srcType;
pAsm->S[0].src.reg = srcReg;
@@ -2928,10 +2928,10 @@ GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
pAsm->S[1].src.reg = dstReg;
setaddrmode_PVSSRC(&(pAsm->S[1].src), ADDR_ABSOLUTE);
noneg_PVSSRC(&(pAsm->S[1].src));
- pAsm->S[1].src.swizzlex = SQ_SEL_W;
- pAsm->S[1].src.swizzley = SQ_SEL_W;
- pAsm->S[1].src.swizzlez = SQ_SEL_W;
- pAsm->S[1].src.swizzlew = SQ_SEL_W;
+ pAsm->S[1].src.swizzlex = SQ_SEL_Z;
+ pAsm->S[1].src.swizzley = SQ_SEL_Z;
+ pAsm->S[1].src.swizzlez = SQ_SEL_Z;
+ pAsm->S[1].src.swizzlew = SQ_SEL_Z;
pAsm->S[2].src.rtype = srcType;
pAsm->S[2].src.reg = srcReg;
@@ -2947,7 +2947,7 @@ GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
return GL_FALSE;
}
- /* dst.z = exp(tmp.x) */
+ /* dst.z = exp(dxt.z) */
pAsm->D.dst.opcode = SQ_OP2_INST_EXP_IEEE;
pAsm->D.dst.math = 1;
pAsm->D.dst.rtype = dstType;
@@ -2957,15 +2957,14 @@ GLboolean assemble_LIT(r700_AssemblerBase *pAsm)
pAsm->D.dst.writez = 1;
pAsm->D.dst.writew = 0;
- pAsm->S[0].src.rtype = SRC_REG_TEMPORARY;
- pAsm->S[0].src.reg = tmp;
+ pAsm->S[0].src.rtype = dstType;
+ pAsm->S[0].src.reg = dstReg;
setaddrmode_PVSSRC(&(pAsm->S[0].src), ADDR_ABSOLUTE);
noneg_PVSSRC(&(pAsm->S[0].src));
- pAsm->S[0].src.swizzlex = SQ_SEL_X;
- pAsm->S[0].src.swizzley = SQ_SEL_X;
- pAsm->S[0].src.swizzlez = SQ_SEL_X;
- pAsm->S[0].src.swizzlew = SQ_SEL_X;
-
+ pAsm->S[0].src.swizzlex = SQ_SEL_Z;
+ pAsm->S[0].src.swizzley = SQ_SEL_Z;
+ pAsm->S[0].src.swizzlez = SQ_SEL_Z;
+ pAsm->S[0].src.swizzlew = SQ_SEL_Z;
if( GL_FALSE == next_ins(pAsm) )
{
return GL_FALSE;
More information about the mesa-commit
mailing list