AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ir3: Emit barriers for images again

Browse Source 
This was accidentally broken with the nir_var_image work.

Fixes: e87dbfd3 ("ir3: Check for nir_var_mem_image in shared_barrier handling")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13593>
This commit is contained in:
Connor Abbott
2021-10-29 15:00:46 +02:00
committed by Marge Bot
parent 8bfa146b80
commit 8d0b508d91
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/ir3/ir3_compiler_nir.c
+5 -4
View File
@@ -1428,21 +1428,22 @@ emit_intrinsic_barrier(struct ir3_context *ctx, nir_intrinsic_instr *intr)
assert(!(modes & nir_var_shader_out));
if ((modes &
(nir_var_mem_shared | nir_var_mem_ssbo | nir_var_mem_global))) {
(nir_var_mem_shared | nir_var_mem_ssbo | nir_var_mem_global |
nir_var_image))) {
barrier = ir3_FENCE(b);
barrier->cat7.r = true;
barrier->cat7.w = true;
if (modes & (nir_var_mem_ssbo | nir_var_mem_global)) {
if (modes & (nir_var_mem_ssbo | nir_var_image | nir_var_mem_global)) {
barrier->cat7.g = true;
}
if (ctx->compiler->gen >= 6) {
if (modes & nir_var_mem_ssbo) {
if (modes & (nir_var_mem_ssbo | nir_var_image)) {
barrier->cat7.l = true;
}
} else {
if (modes & (nir_var_mem_shared | nir_var_mem_ssbo)) {
if (modes & (nir_var_mem_shared | nir_var_mem_ssbo | nir_var_image)) {
barrier->cat7.l = true;
}
}