summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2022-11-30 18:28:49 +0100
committerEric Engestrom <eric@engestrom.ch>2022-12-14 20:47:00 +0000
commit2510c6c502285b7ca2583454960137f887459f85 (patch)
tree0c3981bf872f8e5e417cb9579754d1744d0e4e53
parentb6e7aeb14ec9ba1303110ed007141ff81b5f907b (diff)
downloadmesa-2510c6c502285b7ca2583454960137f887459f85.tar.gz
radv: do not set ZPASS_INCREMENT_DISABLE on GFX11
This field no longer exists. Cc: 22.3 mesa-stable Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20090> (cherry picked from commit b051719b05894c3c5b9f0f8ad919be478b43697b)
-rw-r--r--.pick_status.json2
-rw-r--r--src/amd/vulkan/radv_cmd_buffer.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json
index c6dfbd48a15..69810687b29 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -3838,7 +3838,7 @@
"description": "radv: do not set ZPASS_INCREMENT_DISABLE on GFX11",
"nominated": true,
"nomination_type": 0,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": null
},
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index cc754e80704..156f0472fea 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -3034,7 +3034,8 @@ radv_set_db_count_control(struct radv_cmd_buffer *cmd_buffer, bool enable_occlus
radeon_set_context_reg(cmd_buffer->cs, R_028A4C_PA_SC_MODE_CNTL_1, pa_sc_mode_cntl_1);
}
}
- db_count_control = S_028004_ZPASS_INCREMENT_DISABLE(1);
+ db_count_control =
+ S_028004_ZPASS_INCREMENT_DISABLE(cmd_buffer->device->physical_device->rad_info.gfx_level < GFX11);
} else {
uint32_t sample_rate = util_logbase2(cmd_buffer->state.render.max_samples);
bool gfx10_perfect =