diff options
author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2021-04-20 13:09:09 +0200 |
---|---|---|
committer | Eric Engestrom <eric@engestrom.ch> | 2021-04-25 16:56:02 +0200 |
commit | db1b07411014f3dac29a3a826ae1f10cc41c255e (patch) | |
tree | 4cc38ece4a9e1d25b2631b80a7f1f35bda9355e4 | |
parent | b74e7421b3e3bc308afe369be3fb26776725b928 (diff) |
radv: fix emitting default depth bounds state on GFX6
GFX6 has no CLEAR_STATE.
One step towards Vulkan conformance on these old chips.
Cc: 21.1 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/10347>
(cherry picked from commit a12b844d40187c582c47dddfeecf91d4dd1643df)
-rw-r--r-- | .pick_status.json | 2 | ||||
-rw-r--r-- | src/amd/ci/deqp-radv-oland-aco-fails.txt | 2 | ||||
-rw-r--r-- | src/amd/ci/deqp-radv-pitcairn-aco-fails.txt | 2 | ||||
-rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 3 |
4 files changed, 3 insertions, 6 deletions
diff --git a/.pick_status.json b/.pick_status.json index 801202037f0..4ab0e3b731e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -373,7 +373,7 @@ "description": "radv: fix emitting default depth bounds state on GFX6", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/amd/ci/deqp-radv-oland-aco-fails.txt b/src/amd/ci/deqp-radv-oland-aco-fails.txt index f205e2408f0..322f0e907af 100644 --- a/src/amd/ci/deqp-radv-oland-aco-fails.txt +++ b/src/amd/ci/deqp-radv-oland-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.pipeline.depth.format.d16_unorm.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled,Fail -dEQP-VK.pipeline.depth.format.d32_sfloat.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled,Fail dEQP-VK.robustness.robustness2.bind.notemplate.r32f.dontunroll.volatile.storage_buffer.no_fmt_qual.len_12.samples_1.1d.comp,Fail dEQP-VK.robustness.robustness2.bind.notemplate.r32f.dontunroll.volatile.storage_buffer.no_fmt_qual.len_12.samples_1.1d.frag,Fail dEQP-VK.robustness.robustness2.bind.notemplate.r32f.dontunroll.volatile.storage_buffer.no_fmt_qual.len_12.samples_1.1d.vert,Fail diff --git a/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt b/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt index 8a40ac3ed3b..3cbc83d8cdc 100644 --- a/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt +++ b/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt @@ -1,5 +1,3 @@ -dEQP-VK.pipeline.depth.format.d16_unorm.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled,Fail -dEQP-VK.pipeline.depth.format.d32_sfloat.compare_ops.never_zerodepthbounds_depthdisabled_stencilenabled,Fail dEQP-VK.robustness.robustness2.bind.notemplate.r32f.dontunroll.volatile.storage_buffer.no_fmt_qual.len_12.samples_1.1d.comp,Fail dEQP-VK.robustness.robustness2.bind.notemplate.r32f.dontunroll.volatile.storage_buffer.no_fmt_qual.len_12.samples_1.1d.frag,Fail dEQP-VK.robustness.robustness2.bind.notemplate.r32f.dontunroll.volatile.storage_buffer.no_fmt_qual.len_12.samples_1.1d.vert,Fail diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 059216002ee..e6ca179b7ab 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1263,7 +1263,8 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) if (!cmd_buffer->state.emitted_pipeline) cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_PRIMITIVE_TOPOLOGY | - RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS; + RADV_CMD_DIRTY_DYNAMIC_DEPTH_BIAS | + RADV_CMD_DIRTY_DYNAMIC_DEPTH_BOUNDS; if (!cmd_buffer->state.emitted_pipeline || cmd_buffer->state.emitted_pipeline->graphics.db_depth_control != |