From 9d77cecf88b0816c234dd97a630429242c868db1 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 27 Apr 2021 16:50:06 -0700 Subject: [PATCH] u_format: Fix the BE channel ordering for R5G5B5A1_UINT. It notably didn't fit the pattern of RGB5_A1_UNORM, and violated the general pattern for bitmask format BE channels (channels are ordered right-to-left in the BE columns in the CSV due to the parser walking them in that order for historical reasons). Acked-by: Adam Jackson Acked-by: Ilia Mirkin Part-of: --- src/util/format/u_format.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/format/u_format.csv b/src/util/format/u_format.csv index 9090eab..df63537 100644 --- a/src/util/format/u_format.csv +++ b/src/util/format/u_format.csv @@ -521,7 +521,7 @@ PIPE_FORMAT_A4R4G4B4_UINT , plain, 1, 1, 1, up4 , up4 , up4 , up4 , yz 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 , 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_R5G5B5A1_UINT , plain, 1, 1, 1, up5 , up5 , up5 , up1 , xyzw, rgb, up1 , up5 , up5 , up5 , wzyx PIPE_FORMAT_B5G5R5A1_UINT , plain, 1, 1, 1, up5 , up5 , up5 , up1 , zyxw, rgb, up1 , up5 , up5 , up5 , yzwx PIPE_FORMAT_R8G8B8X8_SNORM , plain, 1, 1, 1, sn8, sn8, sn8, x8, xyz1, rgb -- 2.7.4