From 1219eace69c4a106277ca7dc4c6614f96d7a8167 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Fri, 16 Oct 2020 10:49:48 -0700 Subject: [PATCH] isl: Fix the aux-map encoding for D24_UNORM_X8 Bspec: 53911 now defines the encoding for this format. Cc: mesa-stable Reviewed-by: Sagar Ghuge Part-of: (cherry picked from commit 3c87ac1f60875b5bbd4facca22fc426ee747997a) --- .pick_status.json | 2 +- src/intel/isl/isl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 372309bb349..db157923cce 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4,7 +4,7 @@ "description": "isl: Fix the aux-map encoding for D24_UNORM_X8", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c index e9731616bb1..a037956f017 100644 --- a/src/intel/isl/isl.c +++ b/src/intel/isl/isl.c @@ -2969,7 +2969,7 @@ isl_format_get_aux_map_encoding(enum isl_format format) case ISL_FORMAT_R32_SINT: return 0x12; case ISL_FORMAT_R32_UINT: return 0x13; case ISL_FORMAT_R32_FLOAT: return 0x11; - case ISL_FORMAT_R24_UNORM_X8_TYPELESS: return 0x11; + case ISL_FORMAT_R24_UNORM_X8_TYPELESS: return 0x13; case ISL_FORMAT_B5G6R5_UNORM: return 0xA; case ISL_FORMAT_B5G6R5_UNORM_SRGB: return 0xA; case ISL_FORMAT_B5G5R5A1_UNORM: return 0xA;