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

radv: rename radv_pipeline_key:🆚:dynamic_vs_input to has_prolog

Browse Source 
With GPL it's possible to create VS prologs without this dynamic state,
so it seems better to rename.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18519>
This commit is contained in:
Samuel Pitoiset
2022-09-09 16:52:55 +02:00
committed by Marge Bot
parent 57b3bff41a
commit fdfa59d7bf
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2664,7 +2664,7 @@ radv_generate_graphics_pipeline_key(const struct radv_graphics_pipeline *pipelin
key.has_multiview_view_index = !!state->rp->view_mask; key.has_multiview_view_index = !!state->rp->view_mask;
if (pipeline->dynamic_states & RADV_DYNAMIC_VERTEX_INPUT) { if (pipeline->dynamic_states & RADV_DYNAMIC_VERTEX_INPUT) {
key.vs.dynamic_input_state = true; key.vs.has_prolog = true;
} }
/* Vertex input state */ /* Vertex input state */
@@ -3242,7 +3242,7 @@ radv_lower_vs_input(nir_shader *nir, const struct radv_physical_device *pdevice,
nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_function_impl *impl = nir_shader_get_entrypoint(nir);
bool progress = false; bool progress = false;
if (pipeline_key->vs.dynamic_input_state) if (pipeline_key->vs.has_prolog)
return false; return false;
nir_builder b; nir_builder b;

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

@@ -73,7 +73,7 @@ struct radv_pipeline_key {
uint32_t vertex_attribute_strides[MAX_VERTEX_ATTRIBS]; uint32_t vertex_attribute_strides[MAX_VERTEX_ATTRIBS];
uint8_t vertex_binding_align[MAX_VBS]; uint8_t vertex_binding_align[MAX_VBS];
uint32_t provoking_vtx_last : 1; uint32_t provoking_vtx_last : 1;
uint32_t dynamic_input_state : 1; uint32_t has_prolog : 1;
uint8_t topology; uint8_t topology;
} vs; } vs;

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

@@ -382,7 +382,7 @@ static void
gather_shader_info_vs(struct radv_device *device, const nir_shader *nir, gather_shader_info_vs(struct radv_device *device, const nir_shader *nir,
const struct radv_pipeline_key *pipeline_key, struct radv_shader_info *info) const struct radv_pipeline_key *pipeline_key, struct radv_shader_info *info)
{ {
if (pipeline_key->vs.dynamic_input_state && nir->info.inputs_read) { if (pipeline_key->vs.has_prolog && nir->info.inputs_read) {
info->vs.has_prolog = true; info->vs.has_prolog = true;
info->vs.dynamic_inputs = true; info->vs.dynamic_inputs = true;
} }