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

hasvk: don't export gfx state flushing helper

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18965>
This commit is contained in:
semjon00
2022-10-04 10:59:50 +03:00
committed by Marge Bot
parent 6db3a82fb2
commit bee1f7b83a
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/vulkan_hasvk/anv_genX.h
View File

@@ -105,7 +105,6 @@ void genX(emit_l3_config)(struct anv_batch *batch,
void genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer, void genX(cmd_buffer_config_l3)(struct anv_cmd_buffer *cmd_buffer,
const struct intel_l3_config *cfg); const struct intel_l3_config *cfg);
void genX(cmd_buffer_flush_state)(struct anv_cmd_buffer *cmd_buffer);
void genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer); void genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer);
void genX(cmd_buffer_enable_pma_fix)(struct anv_cmd_buffer *cmd_buffer, void genX(cmd_buffer_enable_pma_fix)(struct anv_cmd_buffer *cmd_buffer,

22
src/intel/vulkan_hasvk/genX_cmd_buffer.c
View File

@@ -3708,8 +3708,8 @@ cmd_buffer_emit_streamout(struct anv_cmd_buffer *cmd_buffer)
anv_batch_emit_merge(&cmd_buffer->batch, dwords, streamout_state_dw); anv_batch_emit_merge(&cmd_buffer->batch, dwords, streamout_state_dw);
} }
void static void
genX(cmd_buffer_flush_state)(struct anv_cmd_buffer *cmd_buffer) genX(cmd_buffer_flush_gfx_state)(struct anv_cmd_buffer *cmd_buffer)
{ {
struct anv_graphics_pipeline *pipeline = cmd_buffer->state.gfx.pipeline; struct anv_graphics_pipeline *pipeline = cmd_buffer->state.gfx.pipeline;
const struct vk_dynamic_graphics_state *dyn = const struct vk_dynamic_graphics_state *dyn =
@@ -4125,7 +4125,7 @@ void genX(CmdDraw)(
"draw", count); "draw", count);
trace_intel_begin_draw(&cmd_buffer->trace); trace_intel_begin_draw(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4173,7 +4173,7 @@ void genX(CmdDrawMultiEXT)(
"draw_multi", count); "draw_multi", count);
trace_intel_begin_draw_multi(&cmd_buffer->trace); trace_intel_begin_draw_multi(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4225,7 +4225,7 @@ void genX(CmdDrawIndexed)(
count); count);
trace_intel_begin_draw_indexed(&cmd_buffer->trace); trace_intel_begin_draw_indexed(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4273,7 +4273,7 @@ void genX(CmdDrawMultiIndexedEXT)(
count); count);
trace_intel_begin_draw_indexed_multi(&cmd_buffer->trace); trace_intel_begin_draw_indexed_multi(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4394,7 +4394,7 @@ void genX(CmdDrawIndirectByteCountEXT)(
instanceCount * pipeline->instance_multiplier); instanceCount * pipeline->instance_multiplier);
trace_intel_begin_draw_indirect_byte_count(&cmd_buffer->trace); trace_intel_begin_draw_indirect_byte_count(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4501,7 +4501,7 @@ void genX(CmdDrawIndirect)(
drawCount); drawCount);
trace_intel_begin_draw_indirect(&cmd_buffer->trace); trace_intel_begin_draw_indirect(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4558,7 +4558,7 @@ void genX(CmdDrawIndexedIndirect)(
drawCount); drawCount);
trace_intel_begin_draw_indexed_indirect(&cmd_buffer->trace); trace_intel_begin_draw_indexed_indirect(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled) if (cmd_buffer->state.conditional_render_enabled)
genX(cmd_emit_conditional_render_predicate)(cmd_buffer); genX(cmd_emit_conditional_render_predicate)(cmd_buffer);
@@ -4725,7 +4725,7 @@ void genX(CmdDrawIndirectCount)(
0); 0);
trace_intel_begin_draw_indirect_count(&cmd_buffer->trace); trace_intel_begin_draw_indirect_count(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
struct mi_builder b; struct mi_builder b;
mi_builder_init(&b, cmd_buffer->device->info, &cmd_buffer->batch); mi_builder_init(&b, cmd_buffer->device->info, &cmd_buffer->batch);
@@ -4793,7 +4793,7 @@ void genX(CmdDrawIndexedIndirectCount)(
0); 0);
trace_intel_begin_draw_indexed_indirect_count(&cmd_buffer->trace); trace_intel_begin_draw_indexed_indirect_count(&cmd_buffer->trace);
genX(cmd_buffer_flush_state)(cmd_buffer); genX(cmd_buffer_flush_gfx_state)(cmd_buffer);
struct mi_builder b; struct mi_builder b;
mi_builder_init(&b, cmd_buffer->device->info, &cmd_buffer->batch); mi_builder_init(&b, cmd_buffer->device->info, &cmd_buffer->batch);