From 52376c9682dfd6ae5f66d4708629fd724bcbd419 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 14 Jan 2021 16:17:21 -0800 Subject: [PATCH] util/format: Fix pack/unpack of A1R5G5B5_UINT. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoids regressing KHR-GL33.packed_pixels.pbo_rectangle.* when transitioning from mesa/main pack/unpack codegen to util/format's. Fixes: b28eb044cdc1 ("gallium: Add equivalents of packed MESA_FORMAT_*UINT formats.") Reviewed-by: Marek Olšák Acked-by: Pierre-Eric Pelloux-Prayer Part-of: (cherry picked from commit e5e75b714d7a386cbdd0956ee4e9a5b4c70c963e) --- .pick_status.json | 2 +- src/util/format/u_format.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index df6f5965e1d..fbc62d4ac5b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -976,7 +976,7 @@ "description": "util/format: Fix pack/unpack of A1R5G5B5_UINT.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "b28eb044cdc1b9bbf4a830b36476f047b660b7ad" }, diff --git a/src/util/format/u_format.csv b/src/util/format/u_format.csv index 8acfb869bdb..237c4c95475 100644 --- a/src/util/format/u_format.csv +++ b/src/util/format/u_format.csv @@ -500,7 +500,7 @@ PIPE_FORMAT_R4G4B4A4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , xy PIPE_FORMAT_B4G4R4A4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , zyxw, rgb, up4 , up4 , up4 , up4 , yzwx PIPE_FORMAT_A4R4G4B4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , yzwx, rgb, up4 , up4 , up4 , up4 , zyxw PIPE_FORMAT_A4B4G4R4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , wzyx, rgb, up4 , up4 , up4 , up4 , xyzw -PIPE_FORMAT_A1R5G5B5_UINT , plain, 1, 1, 1, up1 , up5 , up5 , up5 , wzyx, rgb, up5 , up5 , up5 , up1 , zyxw +PIPE_FORMAT_A1R5G5B5_UINT , plain, 1, 1, 1, up1 , up5 , up5 , up5 , yzwx, rgb, up5 , up5 , up5 , up1 , zyxw PIPE_FORMAT_A1B5G5R5_UINT , plain, 1, 1, 1, up1 , up5 , up5 , up5 , wzyx, rgb, up5 , up5 , up5 , up1 , xyzw PIPE_FORMAT_R5G5B5A1_UINT , plain, 1, 1, 1, up5 , up5 , up5 , up1 , xyzw, rgb, up5 , up5 , up5 , up1 , wzyx PIPE_FORMAT_B5G5R5A1_UINT , plain, 1, 1, 1, up5 , up5 , up5 , up1 , zyxw, rgb, up1 , up5 , up5 , up5 , yzwx