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

radv/gfx10: Set MEM_ORDERED flags on shaders.

Browse Source 
Scattered because depending on stage they are at offset 24/25/27/30.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
This commit is contained in:
Bas Nieuwenhuizen
2019-07-06 12:31:25 +02:00
parent 67b6888d8b
commit aeb5b1a998
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/amd/vulkan/radv_shader.c
View File

@@ -565,6 +565,8 @@ static void radv_postprocess_config(const struct radv_physical_device *pdevice,
} else { } else {
bool enable_prim_id = info->tes.export_prim_id || info->info.uses_prim_id; bool enable_prim_id = info->tes.export_prim_id || info->info.uses_prim_id;
vgpr_comp_cnt = enable_prim_id ? 3 : 2; vgpr_comp_cnt = enable_prim_id ? 3 : 2;
config_out->rsrc1 |= S_00B128_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10);
} }
config_out->rsrc2 |= S_00B12C_OC_LDS_EN(1); config_out->rsrc2 |= S_00B12C_OC_LDS_EN(1);
break; break;
@@ -578,6 +580,7 @@ static void radv_postprocess_config(const struct radv_physical_device *pdevice,
} else { } else {
config_out->rsrc2 |= S_00B12C_OC_LDS_EN(1); config_out->rsrc2 |= S_00B12C_OC_LDS_EN(1);
} }
config_out->rsrc1 |= S_00B428_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10);
break; break;
case MESA_SHADER_VERTEX: case MESA_SHADER_VERTEX:
if (info->vs.as_ls) { if (info->vs.as_ls) {
@@ -603,12 +606,18 @@ static void radv_postprocess_config(const struct radv_physical_device *pdevice,
} else { } else {
vgpr_comp_cnt = 0; vgpr_comp_cnt = 0;
} }
config_out->rsrc1 |= S_00B128_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10);
} }
break; break;
case MESA_SHADER_FRAGMENT: case MESA_SHADER_FRAGMENT:
config_out->rsrc1 |= S_00B028_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10);
break;
case MESA_SHADER_GEOMETRY: case MESA_SHADER_GEOMETRY:
config_out->rsrc1 |= S_00B228_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10);
break; break;
case MESA_SHADER_COMPUTE: case MESA_SHADER_COMPUTE:
config_out->rsrc1 |= S_00B848_MEM_ORDERED(pdevice->rad_info.chip_class >= GFX10);
config_out->rsrc2 |= config_out->rsrc2 |=
S_00B84C_TGID_X_EN(info->info.cs.uses_block_id[0]) | S_00B84C_TGID_X_EN(info->info.cs.uses_block_id[0]) |
S_00B84C_TGID_Y_EN(info->info.cs.uses_block_id[1]) | S_00B84C_TGID_Y_EN(info->info.cs.uses_block_id[1]) |