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

radv: set writes_memory for global memory stores/atomics

Browse Source 
Fixes: 13ab63bb62 ('radv: Implement VK_EXT_buffer_device_address.')
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Rhys Perry
2019-11-28 11:30:55 +00:00
parent a814f3d8a7
commit 35fab1ba33
1 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/amd/vulkan/radv_shader_info.c
View File

@@ -151,6 +151,15 @@ set_output_usage_mask(const nir_shader *nir, const nir_intrinsic_instr *instr,
((wrmask >> (i * 4)) & 0xf) << comp; ((wrmask >> (i * 4)) & 0xf) << comp;
} }
static void
set_writes_memory(const nir_shader *nir, struct radv_shader_info *info)
{
if (nir->info.stage == MESA_SHADER_FRAGMENT)
info->ps.writes_memory = true;
else if (nir->info.stage == MESA_SHADER_GEOMETRY)
info->gs.writes_memory = true;
}
static void static void
gather_intrinsic_store_deref_info(const nir_shader *nir, gather_intrinsic_store_deref_info(const nir_shader *nir,
const nir_intrinsic_instr *instr, const nir_intrinsic_instr *instr,
@@ -308,10 +317,7 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
instr->intrinsic == nir_intrinsic_image_deref_atomic_xor || instr->intrinsic == nir_intrinsic_image_deref_atomic_xor ||
instr->intrinsic == nir_intrinsic_image_deref_atomic_exchange || instr->intrinsic == nir_intrinsic_image_deref_atomic_exchange ||
instr->intrinsic == nir_intrinsic_image_deref_atomic_comp_swap) { instr->intrinsic == nir_intrinsic_image_deref_atomic_comp_swap) {
if (nir->info.stage == MESA_SHADER_FRAGMENT) set_writes_memory(nir, info);
info->ps.writes_memory = true;
else if (nir->info.stage == MESA_SHADER_GEOMETRY)
info->gs.writes_memory = true;
} }
break; break;
} }
@@ -326,17 +332,28 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
case nir_intrinsic_ssbo_atomic_xor: case nir_intrinsic_ssbo_atomic_xor:
case nir_intrinsic_ssbo_atomic_exchange: case nir_intrinsic_ssbo_atomic_exchange:
case nir_intrinsic_ssbo_atomic_comp_swap: case nir_intrinsic_ssbo_atomic_comp_swap:
if (nir->info.stage == MESA_SHADER_FRAGMENT) set_writes_memory(nir, info);
info->ps.writes_memory = true;
else if (nir->info.stage == MESA_SHADER_GEOMETRY)
info->gs.writes_memory = true;
break; break;
case nir_intrinsic_load_deref: case nir_intrinsic_load_deref:
gather_intrinsic_load_deref_info(nir, instr, info); gather_intrinsic_load_deref_info(nir, instr, info);
break; break;
case nir_intrinsic_store_deref: case nir_intrinsic_store_deref:
gather_intrinsic_store_deref_info(nir, instr, info); gather_intrinsic_store_deref_info(nir, instr, info);
/* fallthrough */
case nir_intrinsic_deref_atomic_add:
case nir_intrinsic_deref_atomic_imin:
case nir_intrinsic_deref_atomic_umin:
case nir_intrinsic_deref_atomic_imax:
case nir_intrinsic_deref_atomic_umax:
case nir_intrinsic_deref_atomic_and:
case nir_intrinsic_deref_atomic_or:
case nir_intrinsic_deref_atomic_xor:
case nir_intrinsic_deref_atomic_exchange:
case nir_intrinsic_deref_atomic_comp_swap: {
if (nir_src_as_deref(instr->src[0])->mode & (nir_var_mem_global | nir_var_mem_ssbo))
set_writes_memory(nir, info);
break; break;
}
default: default:
break; break;
} }