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

anv: move restart index to gfx state

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17601>
This commit is contained in:
Lionel Landwerlin
2022-07-04 10:05:21 +03:00
committed by Marge Bot
parent a9abf1dd93
commit 2bfcd29155
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/vulkan/anv_cmd_buffer.c
View File

@@ -258,8 +258,8 @@ anv_cmd_state_init(struct anv_cmd_buffer *cmd_buffer)
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
state->current_pipeline = UINT32_MAX; state->current_pipeline = UINT32_MAX;
state->restart_index = UINT32_MAX;
anv_dynamic_state_init(&state->gfx.dynamic); anv_dynamic_state_init(&state->gfx.dynamic);
state->gfx.restart_index = UINT32_MAX;
state->gfx.dirty = ANV_CMD_DIRTY_DYNAMIC_ALL; state->gfx.dirty = ANV_CMD_DIRTY_DYNAMIC_ALL;
} }

3
src/intel/vulkan/anv_private.h
View File

@@ -2890,6 +2890,8 @@ struct anv_cmd_graphics_state {
struct anv_vb_cache_range vb_bound_ranges[33]; struct anv_vb_cache_range vb_bound_ranges[33];
struct anv_vb_cache_range vb_dirty_ranges[33]; struct anv_vb_cache_range vb_dirty_ranges[33];
uint32_t restart_index;
VkShaderStageFlags push_constant_stages; VkShaderStageFlags push_constant_stages;
struct anv_dynamic_state dynamic; struct anv_dynamic_state dynamic;
@@ -2954,7 +2956,6 @@ struct anv_cmd_state {
VkShaderStageFlags descriptors_dirty; VkShaderStageFlags descriptors_dirty;
VkShaderStageFlags push_constants_dirty; VkShaderStageFlags push_constants_dirty;
uint32_t restart_index;
struct anv_vertex_binding vertex_bindings[MAX_VBS]; struct anv_vertex_binding vertex_bindings[MAX_VBS];
bool xfb_enabled; bool xfb_enabled;
struct anv_xfb_binding xfb_bindings[MAX_XFB_BUFFERS]; struct anv_xfb_binding xfb_bindings[MAX_XFB_BUFFERS];

2
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -7396,7 +7396,7 @@ void genX(CmdBindIndexBuffer)(
ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer); ANV_FROM_HANDLE(anv_cmd_buffer, cmd_buffer, commandBuffer);
ANV_FROM_HANDLE(anv_buffer, buffer, _buffer); ANV_FROM_HANDLE(anv_buffer, buffer, _buffer);
cmd_buffer->state.restart_index = restart_index_for_type(indexType); cmd_buffer->state.gfx.restart_index = restart_index_for_type(indexType);
cmd_buffer->state.gfx.index_buffer = buffer; cmd_buffer->state.gfx.index_buffer = buffer;
cmd_buffer->state.gfx.index_type = vk_to_intel_index_type(indexType); cmd_buffer->state.gfx.index_type = vk_to_intel_index_type(indexType);
cmd_buffer->state.gfx.index_offset = offset; cmd_buffer->state.gfx.index_offset = offset;

2
src/intel/vulkan/gfx7_cmd_buffer.c
View File

@@ -207,7 +207,7 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer)
#if GFX_VERx10 == 75 #if GFX_VERx10 == 75
anv_batch_emit(&cmd_buffer->batch, GFX75_3DSTATE_VF, vf) { anv_batch_emit(&cmd_buffer->batch, GFX75_3DSTATE_VF, vf) {
vf.IndexedDrawCutIndexEnable = d->primitive_restart_enable; vf.IndexedDrawCutIndexEnable = d->primitive_restart_enable;
vf.CutIndex = cmd_buffer->state.restart_index; vf.CutIndex = cmd_buffer->state.gfx.restart_index;
} }
#endif #endif

2
src/intel/vulkan/gfx8_cmd_buffer.c
View File

@@ -588,7 +588,7 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer)
vf.GeometryDistributionEnable = true; vf.GeometryDistributionEnable = true;
#endif #endif
vf.IndexedDrawCutIndexEnable = d->primitive_restart_enable; vf.IndexedDrawCutIndexEnable = d->primitive_restart_enable;
vf.CutIndex = cmd_buffer->state.restart_index; vf.CutIndex = cmd_buffer->state.gfx.restart_index;
} }
} }