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

radv: remove radv_graphics_pipeline::next_vertex_stage

Browse Source 
Use the active stages bitfield instead.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22192>
This commit is contained in:
Samuel Pitoiset
2023-03-29 16:05:32 +02:00
committed by Marge Bot
parent f224e9f1a5
commit 53b2b30d0b
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3715,7 +3715,7 @@ lookup_vs_prolog(struct radv_cmd_buffer *cmd_buffer, const struct radv_shader *v
key.as_ls = vs_shader->info.vs.as_ls && instance_rate_inputs;
key.is_ngg = vs_shader->info.is_ngg;
key.wave32 = vs_shader->info.wave_size == 32;
key.next_stage = pipeline->next_vertex_stage;
key.next_stage = ffs(cmd_buffer->state.active_stages) - 1;
union vs_prolog_key_header header;
header.v = 0;

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

@@ -4409,13 +4409,7 @@ radv_pipeline_init_vertex_input_state(const struct radv_device *device,
}
}
if (pipeline->base.shaders[MESA_SHADER_VERTEX])
pipeline->next_vertex_stage = MESA_SHADER_VERTEX;
else if (pipeline->base.shaders[MESA_SHADER_TESS_CTRL])
pipeline->next_vertex_stage = MESA_SHADER_TESS_CTRL;
else
pipeline->next_vertex_stage = MESA_SHADER_GEOMETRY;
if (pipeline->next_vertex_stage == MESA_SHADER_VERTEX) {
if (pipeline->base.shaders[MESA_SHADER_VERTEX]) {
const struct radv_shader *vs_shader = pipeline->base.shaders[MESA_SHADER_VERTEX];
pipeline->can_use_simple_input = vs_shader->info.is_ngg == pdevice->use_ngg &&
vs_shader->info.wave_size == pdevice->ge_wave_size;

1
src/amd/vulkan/radv_private.h
View File

@@ -2242,7 +2242,6 @@ struct radv_graphics_pipeline {
uint32_t attrib_index_offset[MAX_VERTEX_ATTRIBS];
uint32_t vb_desc_usage_mask;
uint32_t vb_desc_alloc_size;
uint8_t next_vertex_stage;
uint32_t pa_sc_mode_cntl_1;
uint32_t db_render_control;