From: Dave Airlie <airl...@redhat.com>
Signed-off-by: Dave Airlie <airl...@redhat.com>
---
src/amd/vulkan/si_cmd_buffer.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/amd/vulkan/si_cmd_buffer.c b/src/amd/vulkan/si_cmd_buffer.c
index 937f231..021ab88 100644
--- a/src/amd/vulkan/si_cmd_buffer.c
+++ b/src/amd/vulkan/si_cmd_buffer.c
@@ -691,7 +691,6 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer
*cmd_buffer,
bool ia_switch_on_eoi = false;
bool partial_vs_wave = false;
bool partial_es_wave = false;
- uint32_t num_prims =
radv_prims_for_vertices(&cmd_buffer->state.pipeline->graphics.prim_vertex_count,
draw_vertex_count);
bool multi_instances_smaller_than_primgroup;
if (radv_pipeline_has_tess(cmd_buffer->state.pipeline))
@@ -699,8 +698,13 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer
*cmd_buffer,
else if (radv_pipeline_has_gs(cmd_buffer->state.pipeline))
primgroup_size = 64; /* recommended with a GS */
- multi_instances_smaller_than_primgroup = indirect_draw ||
(instanced_draw &&
- num_prims <
primgroup_size);
+ multi_instances_smaller_than_primgroup = indirect_draw;
+ if (!multi_instances_smaller_than_primgroup && instanced_draw) {
+ uint32_t num_prims =
radv_prims_for_vertices(&cmd_buffer->state.pipeline->graphics.prim_vertex_count,
draw_vertex_count);
+ if (num_prims < primgroup_size)
+ multi_instances_smaller_than_primgroup = true;
+ }
+
if
(cmd_buffer->state.pipeline->shaders[MESA_SHADER_FRAGMENT]->info.fs.prim_id_input)
ia_switch_on_eoi = true;
@@ -805,9 +809,11 @@ si_get_ia_multi_vgt_param(struct radv_cmd_buffer
*cmd_buffer,
/* Hw bug with single-primitive instances and SWITCH_ON_EOI
* on multi-SE chips. */
if (info->max_se >= 2 && ia_switch_on_eoi &&
- ((instanced_draw || indirect_draw) &&
- num_prims <= 1))
- cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_VGT_FLUSH;
+ ((instanced_draw || indirect_draw))) {
+ uint32_t num_prims =
radv_prims_for_vertices(&cmd_buffer->state.pipeline->graphics.prim_vertex_count,
draw_vertex_count);
+ if (num_prims <= 1)
+ cmd_buffer->state.flush_bits |=
RADV_CMD_FLAG_VGT_FLUSH;
+ }
}
return S_028AA8_SWITCH_ON_EOP(ia_switch_on_eop) |
--
2.9.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
