diff options
| author | Dave Airlie <[email protected]> | 2017-01-20 12:40:13 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2017-01-31 09:30:41 +1000 |
| commit | 77ec78669af92ddb71047724bbae038804456ec7 (patch) | |
| tree | 3dda9553d05ed78e88637e5369a455c58fcc2a4f | |
| parent | 105ce24d465a91290911f1bf388f69fdf47beed9 (diff) | |
radv: handle prim id inputs to fragment shader.
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index c5f6a9f6fbc..ea1d10ee0be 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -703,7 +703,17 @@ radv_emit_fragment_shader(struct radv_cmd_buffer *cmd_buffer, unsigned val; val = S_028644_PT_SPRITE_TEX(1) | S_028644_OFFSET(0x20); radeon_set_context_reg(cmd_buffer->cs, R_028644_SPI_PS_INPUT_CNTL_0 + 4 * ps_offset, val); - ps_offset = 1; + ps_offset++; + } + + if (ps->info.fs.prim_id_input && (vs->info.vs.prim_id_output != 0xffffffff)) { + unsigned vs_offset, flat_shade; + unsigned val; + vs_offset = vs->info.vs.prim_id_output; + flat_shade = true; + val = S_028644_OFFSET(vs_offset) | S_028644_FLAT_SHADE(flat_shade); + radeon_set_context_reg(cmd_buffer->cs, R_028644_SPI_PS_INPUT_CNTL_0 + 4 * ps_offset, val); + ++ps_offset; } for (unsigned i = 0; i < 32 && (1u << i) <= ps->info.fs.input_mask; ++i) { @@ -722,6 +732,10 @@ radv_emit_fragment_shader(struct radv_cmd_buffer *cmd_buffer, } vs_offset = util_bitcount(vs->info.vs.export_mask & ((1u << i) - 1)); + if (vs->info.vs.prim_id_output != 0xffffffff) { + if (vs_offset >= vs->info.vs.prim_id_output) + vs_offset++; + } flat_shade = !!(ps->info.fs.flat_shaded_mask & (1u << ps_offset)); val = S_028644_OFFSET(vs_offset) | S_028644_FLAT_SHADE(flat_shade); |