commit 4c6969643297a3cab2e28af69d7f8cec2cf9d2ce
author Alexis Hetu <sugoi@google.com> Wed Mar 09 09:28:03 2022 -0500
committer Alexis Hétu <sugoi@google.com> Wed Mar 09 21:20:23 2022 +0000
tree 87c77a43d4feeae8dc63c8fea55b39f025e19586
parent eba569856029de41dbbeb50d62d66702ee20edf5

Use enums of promoted 1.3 extensions

This CL uses the enums of the following promoted extensions:
- VK_EXT_ycbcr_2plane_444_formats
- VK_EXT_4444_formats

Bug: b/198764346
Bug: b/223499383
Change-Id: I398d64be6d3884aa5e1342174c26a6852597bafe
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/63948
Presubmit-Ready: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>

src/Pipeline/SamplerCore.cpp

diff --git a/src/Pipeline/SamplerCore.cpp b/src/Pipeline/SamplerCore.cpp
index d091ea5..4268810 100644
--- a/src/Pipeline/SamplerCore.cpp
+++ b/src/Pipeline/SamplerCore.cpp
@@ -1448,13 +1448,13 @@
 			c.y = (c.x << 4) & Short4(0xF000u);
 			c.x = (c.x << 8) & Short4(0xF000u);
 			break;
-		case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT:
+		case VK_FORMAT_A4R4G4B4_UNORM_PACK16:
 			c.w = (c.x) & Short4(0xF000u);
 			c.z = (c.x << 12) & Short4(0xF000u);
 			c.y = (c.x << 8) & Short4(0xF000u);
 			c.x = (c.x << 4) & Short4(0xF000u);
 			break;
-		case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT:
+		case VK_FORMAT_A4B4G4R4_UNORM_PACK16:
 			c.w = (c.x) & Short4(0xF000u);
 			c.z = (c.x << 4) & Short4(0xF000u);
 			c.y = (c.x << 8) & Short4(0xF000u);