diff options
| author | Christian König <[email protected]> | 2011-01-19 23:46:27 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-01-19 23:48:02 +0100 |
| commit | a124490262a29d2e873fe50ca57974f246946b85 (patch) | |
| tree | 44de99807ba72e09cc570fedc4fb5cbb022fa95a /src/gallium/drivers/r600 | |
| parent | 3ee60a3558a3546b3c3a0a9732d384afcf02994a (diff) | |
r600g: fix segfault if texture operand is a literal
This fixes Bug 33262
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index 5c5ff4e7394..df97c32bc74 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -1838,7 +1838,9 @@ static int tgsi_tex(struct r600_shader_ctx *ctx) for (i = 0; i < 4; i++) { memset(&alu, 0, sizeof(struct r600_bc_alu)); alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV); - alu.src[0].sel = src_gpr; + r = tgsi_src(ctx, &inst->Src[0], &alu.src[0]); + if (r) + return r; alu.src[0].chan = tgsi_chan(&inst->Src[0], i); alu.dst.sel = ctx->temp_reg; alu.dst.chan = i; |