fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 22:49:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

microsoft/compiler: Handle scoped barrier in Tess splitting

Browse source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3339>
This commit is contained in:
Caio Oliveira 2023-02-26 14:11:04 -08:00 • committed by Marge Bot
parent 1db7e6a261
commit e411e0afd3
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/microsoft/compiler/dxil_nir_tess.c
View file

@ -27,6 +27,21 @@
#include "dxil_nir.h"
static bool
is_memory_barrier_tcs_patch(const nir_intrinsic_instr *intr)
{
if (intr->intrinsic == nir_intrinsic_scoped_barrier &&
nir_intrinsic_memory_modes(intr) & nir_var_shader_out) {
assert(nir_intrinsic_memory_modes(intr) == nir_var_shader_out);
assert(nir_intrinsic_memory_scope(intr) == NIR_SCOPE_WORKGROUP);
return true;
} else if (intr->intrinsic == nir_intrinsic_memory_barrier_tcs_patch) {
return true;
} else {
return false;
}
}
static void
remove_hs_intrinsics(nir_function_impl *impl)
{
@ -36,7 +51,7 @@ remove_hs_intrinsics(nir_function_impl *impl)
continue;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_store_output &&
intr->intrinsic != nir_intrinsic_memory_barrier_tcs_patch &&
!is_memory_barrier_tcs_patch(intr) &&
intr->intrinsic != nir_intrinsic_control_barrier)
continue;
nir_instr_remove(instr);
@ -85,7 +100,7 @@ prune_patch_function_to_intrinsic_and_srcs(nir_function_impl *impl)
if (instr->type == nir_instr_type_intrinsic) {
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_store_output &&
intr->intrinsic != nir_intrinsic_memory_barrier_tcs_patch)
!is_memory_barrier_tcs_patch(intr))
continue;
} else if (instr->type != nir_instr_type_jump)
continue;
@ -253,7 +268,11 @@ dxil_nir_split_tess_ctrl(nir_shader *nir, nir_function **patch_const_func)
nir_ssa_def_rewrite_uses(&intr->dest.ssa, state.count);
break;
}
case nir_intrinsic_scoped_barrier:
case nir_intrinsic_memory_barrier_tcs_patch:
if (!is_memory_barrier_tcs_patch(intr))
break;
/* The GL tessellation spec says:
* The barrier() function may only be called inside the main entry point of the tessellation control shader
* and may not be called in potentially divergent flow control. In particular, barrier() may not be called