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/PixelProgram.cpp

diff --git a/src/Pipeline/PixelProgram.cpp b/src/Pipeline/PixelProgram.cpp
index 5d4da9b..6b16d3b 100644
--- a/src/Pipeline/PixelProgram.cpp
+++ b/src/Pipeline/PixelProgram.cpp
@@ -279,8 +279,8 @@
 		{
 		case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
 		case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
-		case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT:
-		case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT:
+		case VK_FORMAT_A4R4G4B4_UNORM_PACK16:
+		case VK_FORMAT_A4B4G4R4_UNORM_PACK16:
 		case VK_FORMAT_B5G6R5_UNORM_PACK16:
 		case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
 		case VK_FORMAT_B5G5R5A1_UNORM_PACK16:
@@ -375,8 +375,8 @@
 			break;
 		case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
 		case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
-		case VK_FORMAT_A4R4G4B4_UNORM_PACK16_EXT:
-		case VK_FORMAT_A4B4G4R4_UNORM_PACK16_EXT:
+		case VK_FORMAT_A4R4G4B4_UNORM_PACK16:
+		case VK_FORMAT_A4B4G4R4_UNORM_PACK16:
 		case VK_FORMAT_B5G6R5_UNORM_PACK16:
 		case VK_FORMAT_R5G5B5A1_UNORM_PACK16:
 		case VK_FORMAT_B5G5R5A1_UNORM_PACK16: