Mesa (master): r600g: actualy fix the literal emission
Jerome Glisse
glisse at kemper.freedesktop.org
Wed Jul 28 13:12:43 UTC 2010
Module: Mesa
Branch: master
Commit: 9961a0b92de7afed2afec62dadad08d76d1d3374
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9961a0b92de7afed2afec62dadad08d76d1d3374
Author: Jerome Glisse <jglisse at redhat.com>
Date: Wed Jul 28 09:11:14 2010 -0400
r600g: actualy fix the literal emission
Previous patch added literal emission to wrong place, we
want to emit literal before emitting a new alu group.
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
---
src/gallium/drivers/r600/r600_shader.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 9796112..a2d641d 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -557,9 +557,6 @@ static int tgsi_slt(struct r600_shader_ctx *ctx)
struct r600_bc_alu alu;
int i, r;
- r = r600_bc_add_literal(ctx->bc, ctx->value);
- if (r)
- return r;
for (i = 0; i < 4; i++) {
memset(&alu, 0, sizeof(struct r600_bc_alu));
if (!(inst->Dst[0].Register.WriteMask & (1 << i))) {
@@ -739,6 +736,9 @@ static int tgsi_helper_copy(struct r600_shader_ctx *ctx, struct tgsi_full_instru
struct r600_bc_alu alu;
int i, r;
+ r = r600_bc_add_literal(ctx->bc, ctx->value);
+ if (r)
+ return r;
for (i = 0; i < 4; i++) {
memset(&alu, 0, sizeof(struct r600_bc_alu));
if (!(inst->Dst[0].Register.WriteMask & (1 << i))) {
More information about the mesa-commit
mailing list