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

radv: don't shrink image stores for The Surge 2

Browse Source 
The game seems to declare the wrong format.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Fixes: e4d75c22 ("nir/opt_shrink_vectors: shrink image stores using the format")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4347
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9229>
This commit is contained in:
Rhys Perry
2021-02-23 19:33:02 +00:00
committed by Marge Bot
parent cbb5ed476c
commit 21697082ec
7 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/amd/vulkan/radv_pipeline.c
View File

@@ -2359,7 +2359,8 @@ radv_link_shaders(struct radv_pipeline *pipeline, nir_shader **shaders,
if (nir_lower_io_to_scalar_early(ordered_shaders[i], mask)) {
/* Optimize the new vector code and then remove dead vars */
nir_copy_prop(ordered_shaders[i]);
nir_opt_shrink_vectors(ordered_shaders[i], true);
nir_opt_shrink_vectors(ordered_shaders[i],
!pipeline->device->instance->disable_shrink_image_store);
if (ordered_shaders[i]->info.stage != last) {
/* Optimize swizzled movs of load_const for
@@ -3305,7 +3306,7 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline,
for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
if (nir[i]) {
radv_start_feedback(stage_feedbacks[i]);
radv_optimize_nir(nir[i], optimize_conservatively, false);
radv_optimize_nir(device, nir[i], optimize_conservatively, false);
radv_stop_feedback(stage_feedbacks[i], false);
}
}
@@ -3351,7 +3352,8 @@ VkResult radv_create_shaders(struct radv_pipeline *pipeline,
radv_lower_io(device, nir[i]);
lower_to_scalar |= nir_opt_shrink_vectors(nir[i], true);
lower_to_scalar |= nir_opt_shrink_vectors(nir[i],
!device->instance->disable_shrink_image_store);
if (lower_to_scalar)
nir_lower_alu_to_scalar(nir[i], NULL, NULL);