Mesa (master): r300c: Fix up for register allocator rewrite.
Michel Dänzer
daenzer at kemper.freedesktop.org
Mon May 9 16:35:24 UTC 2011
Module: Mesa
Branch: master
Commit: 39be542f734f5725108f3e0223a9d748033b4735
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=39be542f734f5725108f3e0223a9d748033b4735
Author: Michel Dänzer <daenzer at vmware.com>
Date: Mon May 9 18:26:50 2011 +0200
r300c: Fix up for register allocator rewrite.
Was broken by commit fe622bac0c1b5b9f2a9fcf9f35b51232a06bea42 ('r300/compiler:
Rewrite register allocator').
---
src/mesa/drivers/dri/r300/r300_blit.c | 1 +
src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/mesa/drivers/dri/r300/r300_blit.c b/src/mesa/drivers/dri/r300/r300_blit.c
index 14e6086..c525f0f 100644
--- a/src/mesa/drivers/dri/r300/r300_blit.c
+++ b/src/mesa/drivers/dri/r300/r300_blit.c
@@ -118,6 +118,7 @@ static void create_fragment_program(struct r300_context *r300)
inst->U.I.SrcReg[0].Negate = 0;
inst->U.I.SrcReg[0].RelAddr = 0;
inst->U.I.SrcReg[0].Swizzle = RC_SWIZZLE_XYZW;
+ inst->U.I.TexSwizzle = RC_SWIZZLE_XYZW;
compiler.Base.Program.InputsRead = (1 << FRAG_ATTRIB_TEX0);
compiler.OutputColor[0] = FRAG_RESULT_COLOR;
diff --git a/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
index 232603e..b1dfccd 100644
--- a/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
+++ b/src/mesa/drivers/dri/r300/radeon_mesa_to_rc.c
@@ -170,6 +170,7 @@ static void translate_instruction(struct radeon_compiler * c,
dest->U.I.TexSrcUnit = src->TexSrcUnit;
dest->U.I.TexSrcTarget = translate_tex_target(src->TexSrcTarget);
dest->U.I.TexShadow = src->TexShadow;
+ dest->U.I.TexSwizzle = RC_SWIZZLE_XYZW;
}
}
More information about the mesa-commit
mailing list