OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv: gather primitive ID in the shader info pass

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset
2019-09-03 18:12:33 +02:00
parent 1877e87f1e
commit 3e8bda66ae
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -2828,8 +2828,6 @@ handle_vs_outputs_post(struct radv_shader_context *ctx,
/* Export PrimitiveID. */ /* Export PrimitiveID. */
if (export_prim_id) { if (export_prim_id) {
outinfo->export_prim_id = true;
outputs[noutput].slot_name = VARYING_SLOT_PRIMITIVE_ID; outputs[noutput].slot_name = VARYING_SLOT_PRIMITIVE_ID;
outputs[noutput].slot_index = 0; outputs[noutput].slot_index = 0;
outputs[noutput].usage_mask = 0x1; outputs[noutput].usage_mask = 0x1;
@@ -3256,7 +3254,6 @@ handle_ngg_outputs_post(struct radv_shader_context *ctx)
radv_export_param(ctx, param_count, values, 0x1); radv_export_param(ctx, param_count, values, 0x1);
outinfo->vs_output_param_offset[VARYING_SLOT_PRIMITIVE_ID] = param_count++; outinfo->vs_output_param_offset[VARYING_SLOT_PRIMITIVE_ID] = param_count++;
outinfo->export_prim_id = true;
outinfo->param_exports = param_count; outinfo->param_exports = param_count;
} }
} }

17
src/amd/vulkan/radv_shader_info.c
View File

@@ -687,6 +687,23 @@ radv_nir_shader_info_pass(const struct nir_shader *nir,
} }
} }
/* Make sure to export the PrimitiveID if the fragment shader needs it. */
if (options->key.vs_common_out.export_prim_id) {
switch (nir->info.stage) {
case MESA_SHADER_VERTEX:
info->vs.outinfo.export_prim_id = true;
break;
case MESA_SHADER_TESS_EVAL:
info->tes.outinfo.export_prim_id = true;
break;
case MESA_SHADER_GEOMETRY:
info->vs.outinfo.export_prim_id = true;
break;
default:
break;
}
}
if (nir->info.stage == MESA_SHADER_FRAGMENT) if (nir->info.stage == MESA_SHADER_FRAGMENT)
info->ps.num_interp = nir->num_inputs; info->ps.num_interp = nir->num_inputs;