diff --git a/.pick_status.json b/.pick_status.json index f7d0ca6194a..9dcd8d5227f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1164,7 +1164,7 @@ "description": "panvk: Also load output attachments with LOAD_OP_NONE+STORE_OP_NONE", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/panfrost/ci/panfrost-g925-fails.txt b/src/panfrost/ci/panfrost-g925-fails.txt index 94645a08fba..a08c1377d3c 100644 --- a/src/panfrost/ci/panfrost-g925-fails.txt +++ b/src/panfrost/ci/panfrost-g925-fails.txt @@ -3,8 +3,6 @@ dEQP-VK.wsi.wayland.swapchain.create.image_extent,Crash dEQP-VK.wsi.wayland.swapchain.simulate_oom.image_extent,Crash -angle-KHR-GLES3.packed_depth_stencil.verify_read_pixels.depth24_stencil8,Fail -angle-KHR-GLES3.packed_depth_stencil.verify_read_pixels.depth32f_stencil8,Fail angle-KHR-GLES31.core.shader_atomic_counters.advanced-usage-multi-stage,Fail angle-KHR-GLES31.core.shader_storage_buffer_object.advanced-matrix-vsfs,Fail angle-KHR-GLES31.core.shader_storage_buffer_object.advanced-usage-sync-vsfs,Fail diff --git a/src/panfrost/vulkan/panvk_vX_cmd_draw.c b/src/panfrost/vulkan/panvk_vX_cmd_draw.c index f69e53593a9..a8be21365e8 100644 --- a/src/panfrost/vulkan/panvk_vX_cmd_draw.c +++ b/src/panfrost/vulkan/panvk_vX_cmd_draw.c @@ -23,7 +23,6 @@ att_set_clear_preload(const VkRenderingAttachmentInfo *att, bool *clear, bool *p *preload = true; break; case VK_ATTACHMENT_LOAD_OP_NONE: - break; case VK_ATTACHMENT_LOAD_OP_DONT_CARE: /* This is a very frustrating corner case. From the spec: *