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

radv: Add export_prim_id to the shader variant info.

Browse Source 
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Bas Nieuwenhuizen
2019-07-02 00:41:47 +02:00
parent 15046ef7c8
commit 43f2f01cc8
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3973,6 +3973,7 @@ ac_fill_shader_info(struct radv_shader_variant_info *shader_info, struct nir_sha
shader_info->tes.ccw = nir->info.tess.ccw; shader_info->tes.ccw = nir->info.tess.ccw;
shader_info->tes.point_mode = nir->info.tess.point_mode; shader_info->tes.point_mode = nir->info.tess.point_mode;
shader_info->tes.as_es = options->key.tes.as_es; shader_info->tes.as_es = options->key.tes.as_es;
shader_info->tes.export_prim_id = options->key.tes.export_prim_id;
break; break;
case MESA_SHADER_TESS_CTRL: case MESA_SHADER_TESS_CTRL:
shader_info->tcs.tcs_vertices_out = nir->info.tess.tcs_vertices_out; shader_info->tcs.tcs_vertices_out = nir->info.tess.tcs_vertices_out;
@@ -3980,6 +3981,7 @@ ac_fill_shader_info(struct radv_shader_variant_info *shader_info, struct nir_sha
case MESA_SHADER_VERTEX: case MESA_SHADER_VERTEX:
shader_info->vs.as_es = options->key.vs.as_es; shader_info->vs.as_es = options->key.vs.as_es;
shader_info->vs.as_ls = options->key.vs.as_ls; shader_info->vs.as_ls = options->key.vs.as_ls;
shader_info->vs.export_prim_id = options->key.vs.export_prim_id;
break; break;
default: default:
break; break;

4
src/amd/vulkan/radv_shader.c
View File

@@ -501,7 +501,7 @@ radv_fill_shader_variant(struct radv_device *device,
assert(device->physical_device->rad_info.chip_class <= GFX8); assert(device->physical_device->rad_info.chip_class <= GFX8);
vgpr_comp_cnt = info->uses_prim_id ? 3 : 2; vgpr_comp_cnt = info->uses_prim_id ? 3 : 2;
} else { } else {
bool enable_prim_id = options->key.tes.export_prim_id || info->uses_prim_id; bool enable_prim_id = variant->info.tes.export_prim_id || info->uses_prim_id;
vgpr_comp_cnt = enable_prim_id ? 3 : 2; vgpr_comp_cnt = enable_prim_id ? 3 : 2;
} }
variant->config.rsrc2 |= S_00B12C_OC_LDS_EN(1); variant->config.rsrc2 |= S_00B12C_OC_LDS_EN(1);
@@ -534,7 +534,7 @@ radv_fill_shader_variant(struct radv_device *device,
* If PrimID is disabled. InstanceID / StepRate1 is loaded instead. * If PrimID is disabled. InstanceID / StepRate1 is loaded instead.
* StepRate0 is set to 1. so that VGPR3 doesn't have to be loaded. * StepRate0 is set to 1. so that VGPR3 doesn't have to be loaded.
*/ */
if (options->key.vs.export_prim_id) { if (variant->info.vs.export_prim_id) {
vgpr_comp_cnt = 2; vgpr_comp_cnt = 2;
} else if (info->vs.needs_instance_id) { } else if (info->vs.needs_instance_id) {
vgpr_comp_cnt = 1; vgpr_comp_cnt = 1;

2
src/amd/vulkan/radv_shader.h
View File

@@ -268,6 +268,7 @@ struct radv_shader_variant_info {
struct radv_es_output_info es_info; struct radv_es_output_info es_info;
bool as_es; bool as_es;
bool as_ls; bool as_ls;
bool export_prim_id;
} vs; } vs;
struct { struct {
unsigned num_interp; unsigned num_interp;
@@ -302,6 +303,7 @@ struct radv_shader_variant_info {
enum gl_tess_spacing spacing; enum gl_tess_spacing spacing;
bool ccw; bool ccw;
bool point_mode; bool point_mode;
bool export_prim_id;
} tes; } tes;
}; };
}; };