Module: Mesa Branch: staging/21.2 Commit: 7c2966970b455059769a84f2041286784fd226a6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c2966970b455059769a84f2041286784fd226a6
Author: Alyssa Rosenzweig <[email protected]> Date: Tue Jun 15 13:10:35 2021 -0400 pan/mdg: Handle swapped 565 and 1010102 unorm Signed-off-by: Alyssa Rosenzweig <[email protected]> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11383> (cherry picked from commit 5c4b54ce96d2813a88bffcafc95162a1a072e62c) Conflicts: src/panfrost/util/pan_lower_framebuffer.c --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt | 1 - src/panfrost/util/pan_lower_framebuffer.c | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3f388f93627..15997945cad 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -283,7 +283,7 @@ "description": "pan/mdg: Handle swapped 565 and 1010102 unorm", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt index 4fe0791c622..0d0992393cc 100644 --- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt +++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt @@ -16,7 +16,6 @@ dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_blend_func_b dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_separate_blend_func_buffer_blend_func,Fail dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_separate_blend_func_buffer_separate_blend_func,Fail dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_blend_func_buffer_blend_func,Fail -dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_blend_func_buffer_separate_blend_func,Fail dEQP-GLES31.functional.draw_buffers_indexed.overwrite_indexed.common_separate_blend_func_buffer_blend_func,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.0,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.1,Fail diff --git a/src/panfrost/util/pan_lower_framebuffer.c b/src/panfrost/util/pan_lower_framebuffer.c index fe05ecaf030..5862d037fda 100644 --- a/src/panfrost/util/pan_lower_framebuffer.c +++ b/src/panfrost/util/pan_lower_framebuffer.c @@ -626,10 +626,12 @@ pan_pack(nir_builder *b, switch (desc->format) { case PIPE_FORMAT_B5G5R5A1_UNORM: case PIPE_FORMAT_R5G5B5A1_UNORM: - return pan_pack_unorm_5551(b, unpacked); + return pan_pack_unorm(b, unpacked, 5, 6, 5, 1); + case PIPE_FORMAT_R5G6B5_UNORM: case PIPE_FORMAT_B5G6R5_UNORM: return pan_pack_unorm_565(b, unpacked); case PIPE_FORMAT_R10G10B10A2_UNORM: + case PIPE_FORMAT_B10G10R10A2_UNORM: return pan_pack_unorm_1010102(b, unpacked); case PIPE_FORMAT_R10G10B10A2_UINT: return pan_pack_uint_1010102(b, unpacked);
