diff options
| author | Christoph Bumiller <[email protected]> | 2013-08-01 20:56:21 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-08-02 13:32:49 +0200 |
| commit | 957a2014f9f3f9d7c3e53642dafcdc529eb0a466 (patch) | |
| tree | 31a9d716c3ba3ca392f1c2e3647e1dfd6d7d29d7 | |
| parent | 38903db4398e2b3a6f8ddd09d82974a2d843f1a7 (diff) | |
r600g: honour semantic index in fragment color exports
Signed-off-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/r600/r600_shader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c index dc44faee36b..37298ccdcf2 100644 --- a/src/gallium/drivers/r600/r600_shader.c +++ b/src/gallium/drivers/r600/r600_shader.c @@ -917,7 +917,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, unsigned output_done, noutput; unsigned opcode; int i, j, k, r = 0; - int next_pixel_base = 0, next_pos_base = 60, next_param_base = 0; + int next_pos_base = 60, next_param_base = 0; /* Declarations used by llvm code */ bool use_llvm = false; bool indirect_gprs; @@ -1440,13 +1440,13 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, case TGSI_PROCESSOR_FRAGMENT: if (shader->output[i].name == TGSI_SEMANTIC_COLOR) { /* never export more colors than the number of CBs */ - if (next_pixel_base && next_pixel_base >= key.nr_cbufs) { + if (shader->output[i].sid >= key.nr_cbufs) { /* skip export */ j--; continue; } output[j].swizzle_w = key.alpha_to_one ? 5 : 3; - output[j].array_base = next_pixel_base++; + output[j].array_base = shader->output[i].sid; output[j].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL; shader->nr_ps_color_exports++; if (shader->fs_write_all && (rscreen->chip_class >= EVERGREEN)) { @@ -1461,7 +1461,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, output[j].swizzle_w = key.alpha_to_one ? 5 : 3; output[j].burst_count = 1; output[j].barrier = 1; - output[j].array_base = next_pixel_base++; + output[j].array_base = k; output[j].op = CF_OP_EXPORT; output[j].type = V_SQ_CF_ALLOC_EXPORT_WORD0_SQ_EXPORT_PIXEL; shader->nr_ps_color_exports++; @@ -1532,7 +1532,7 @@ static int r600_shader_from_tgsi(struct r600_screen *rscreen, } /* add fake pixel export */ - if (ctx.type == TGSI_PROCESSOR_FRAGMENT && next_pixel_base == 0) { + if (ctx.type == TGSI_PROCESSOR_FRAGMENT && shader->nr_ps_color_exports == 0) { memset(&output[j], 0, sizeof(struct r600_bytecode_output)); output[j].gpr = 0; output[j].elem_size = 3; |