fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 11:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv: handle layer export from vs->fs properly

Browse source 
Fixes:
dEQP-VK.geometry.layered.1d_array.fragment_layer

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2017-01-31 05:56:49 +10:00
parent c9c8ae1fd3
commit ca822e1b7c
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/amd/common/ac_nir_to_llvm.c
View file

@ -4114,7 +4114,7 @@ handle_fs_inputs_pre(struct nir_to_llvm_context *ctx,
continue; continue;
if (i >= VARYING_SLOT_VAR0 || i == VARYING_SLOT_PNTC || if (i >= VARYING_SLOT_VAR0 || i == VARYING_SLOT_PNTC ||
i == VARYING_SLOT_PRIMITIVE_ID) { i == VARYING_SLOT_PRIMITIVE_ID || i == VARYING_SLOT_LAYER) {
interp_param = *inputs; interp_param = *inputs;
interp_fs_input(ctx, index, interp_param, ctx->prim_mask, interp_fs_input(ctx, index, interp_param, ctx->prim_mask,
inputs); inputs);
@ -4134,6 +4134,8 @@ handle_fs_inputs_pre(struct nir_to_llvm_context *ctx,
ctx->shader_info->fs.has_pcoord = true; ctx->shader_info->fs.has_pcoord = true;
if (ctx->input_mask & (1 << VARYING_SLOT_PRIMITIVE_ID)) if (ctx->input_mask & (1 << VARYING_SLOT_PRIMITIVE_ID))
ctx->shader_info->fs.prim_id_input = true; ctx->shader_info->fs.prim_id_input = true;
if (ctx->input_mask & (1 << VARYING_SLOT_LAYER))
ctx->shader_info->fs.layer_input = true;
ctx->shader_info->fs.input_mask = ctx->input_mask >> VARYING_SLOT_VAR0; ctx->shader_info->fs.input_mask = ctx->input_mask >> VARYING_SLOT_VAR0;
} }
@ -4422,6 +4424,7 @@ handle_vs_outputs_post(struct nir_to_llvm_context *ctx)
(1ull << VARYING_SLOT_CULL_DIST1)); (1ull << VARYING_SLOT_CULL_DIST1));
ctx->shader_info->vs.prim_id_output = 0xffffffff; ctx->shader_info->vs.prim_id_output = 0xffffffff;
ctx->shader_info->vs.layer_output = 0xffffffff;
if (clip_mask) { if (clip_mask) {
LLVMValueRef slots[8]; LLVMValueRef slots[8];
unsigned j; unsigned j;
@ -4478,7 +4481,9 @@ handle_vs_outputs_post(struct nir_to_llvm_context *ctx)
} else if (i == VARYING_SLOT_LAYER) { } else if (i == VARYING_SLOT_LAYER) {
ctx->shader_info->vs.writes_layer = true; ctx->shader_info->vs.writes_layer = true;
layer_value = values[0]; layer_value = values[0];
continue; ctx->shader_info->vs.layer_output = param_count;
target = V_008DFC_SQ_EXP_PARAM + param_count;
param_count++;
} else if (i == VARYING_SLOT_VIEWPORT) { } else if (i == VARYING_SLOT_VIEWPORT) {
ctx->shader_info->vs.writes_viewport_index = true; ctx->shader_info->vs.writes_viewport_index = true;
viewport_index_value = values[0]; viewport_index_value = values[0];

2
src/amd/common/ac_nir_to_llvm.h
View file

@ -107,6 +107,7 @@ struct ac_shader_variant_info {
uint8_t cull_dist_mask; uint8_t cull_dist_mask;
uint32_t esgs_itemsize; uint32_t esgs_itemsize;
uint32_t prim_id_output; uint32_t prim_id_output;
uint32_t layer_output;
} vs; } vs;
struct { struct {
unsigned num_interp; unsigned num_interp;
@ -121,6 +122,7 @@ struct ac_shader_variant_info {
bool writes_memory; bool writes_memory;
bool force_persample; bool force_persample;
bool prim_id_input; bool prim_id_input;
bool layer_input;
} fs; } fs;
struct { struct {
unsigned block_size[3]; unsigned block_size[3];

14
src/amd/vulkan/radv_cmd_buffer.c
View file

@ -718,6 +718,16 @@ radv_emit_fragment_shader(struct radv_cmd_buffer *cmd_buffer,
++ps_offset; ++ps_offset;
} }
if (ps->info.fs.layer_input && (vs->info.vs.layer_output != 0xffffffff)) {
unsigned vs_offset, flat_shade;
unsigned val;
vs_offset = vs->info.vs.layer_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) { for (unsigned i = 0; i < 32 && (1u << i) <= ps->info.fs.input_mask; ++i) {
unsigned vs_offset, flat_shade; unsigned vs_offset, flat_shade;
unsigned val; unsigned val;
@ -738,6 +748,10 @@ radv_emit_fragment_shader(struct radv_cmd_buffer *cmd_buffer,
if (vs_offset >= vs->info.vs.prim_id_output) if (vs_offset >= vs->info.vs.prim_id_output)
vs_offset++; vs_offset++;
} }
if (vs->info.vs.layer_output != 0xffffffff) {
if (vs_offset >= vs->info.vs.layer_output)
vs_offset++;
}
flat_shade = !!(ps->info.fs.flat_shaded_mask & (1u << ps_offset)); flat_shade = !!(ps->info.fs.flat_shaded_mask & (1u << ps_offset));
val = S_028644_OFFSET(vs_offset) | S_028644_FLAT_SHADE(flat_shade); val = S_028644_OFFSET(vs_offset) | S_028644_FLAT_SHADE(flat_shade);