From 5c4b54ce96d2813a88bffcafc95162a1a072e62c Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 15 Jun 2021 13:10:35 -0400 Subject: [PATCH] pan/mdg: Handle swapped 565 and 1010102 unorm Signed-off-by: Alyssa Rosenzweig Cc: mesa-stable Part-of: --- src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt | 2 -- src/panfrost/util/pan_lower_framebuffer.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) 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 20ff4c22a83..ed977926670 100644 --- a/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt +++ b/src/gallium/drivers/panfrost/ci/deqp-panfrost-t860-fails.txt @@ -13,11 +13,9 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y,Fa dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x,Fail dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y,Fail dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_blend_func_buffer_blend_func,Fail -dEQP-GLES31.functional.draw_buffers_indexed.overwrite_common.common_blend_func_buffer_separate_blend_func,Fail 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.overwrite_indexed.common_separate_blend_func_buffer_separate_blend_func,Fail dEQP-GLES31.functional.draw_buffers_indexed.random.max_implementation_draw_buffers.0,Fail diff --git a/src/panfrost/util/pan_lower_framebuffer.c b/src/panfrost/util/pan_lower_framebuffer.c index 6dd949f6c93..71795fd9416 100644 --- a/src/panfrost/util/pan_lower_framebuffer.c +++ b/src/panfrost/util/pan_lower_framebuffer.c @@ -423,9 +423,11 @@ pan_pack(nir_builder *b, case PIPE_FORMAT_B5G5R5A1_UNORM: case PIPE_FORMAT_R5G5B5A1_UNORM: return pan_pack_unorm(b, unpacked, 5, 6, 5, 1); + case PIPE_FORMAT_R5G6B5_UNORM: case PIPE_FORMAT_B5G6R5_UNORM: return pan_pack_unorm(b, unpacked, 5, 6, 5, 0); 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);