commit 57977c1c07d33f6f6a9c2ae373085c7575e23bdf
author Chris Forbes <chrisforbes@google.com> Thu Dec 19 16:09:18 2019 -0800
committer Chris Forbes <chrisforbes@google.com> Wed Jan 08 15:38:32 2020 +0000
tree 971b5164318b458e5bca935d2e0ebe724034e5a5
parent 7d0ce41d01de6236e9d3336502bf2c4a45a2c542

Add storage image support for R16G16_{UINT,SINT,SFLOAT}

This is a step toward being able to claim support for
storageImageExtendedFormats.

Bug: b/146579770
Test: dEQP-VK.*r16g16*
Change-Id: Iba658f39271f7e181c10c117e53c8e3dbdf37595
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/39769
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>

src/Pipeline/SpirvShaderImage.cpp

diff --git a/src/Pipeline/SpirvShaderImage.cpp b/src/Pipeline/SpirvShaderImage.cpp
index 1ec6f89..e632310 100644
--- a/src/Pipeline/SpirvShaderImage.cpp
+++ b/src/Pipeline/SpirvShaderImage.cpp
@@ -43,6 +43,9 @@
 		case spv::ImageFormatRg32f: return VK_FORMAT_R32G32_SFLOAT;
 		case spv::ImageFormatRg32i: return VK_FORMAT_R32G32_SINT;
 		case spv::ImageFormatRg32ui: return VK_FORMAT_R32G32_UINT;
+		case spv::ImageFormatRg16f: return VK_FORMAT_R16G16_SFLOAT;
+		case spv::ImageFormatRg16i: return VK_FORMAT_R16G16_SINT;
+		case spv::ImageFormatRg16ui: return VK_FORMAT_R16G16_UINT;
 
 		default:
 			UNIMPLEMENTED("SPIR-V ImageFormat %u", format);
@@ -922,8 +925,18 @@
 			packed[1] = texel.Int(1);
 			numPackedElements = 2;
 			break;
-
 		case spv::ImageFormatRg16f:
+			texelSize = 4;
+			packed[0] = floatToHalfBits(texel.UInt(0), false) | floatToHalfBits(texel.UInt(1), true);
+			numPackedElements = 1;
+			break;
+		case spv::ImageFormatRg16i:
+		case spv::ImageFormatRg16ui:
+			texelSize = 4;
+			packed[0] = SIMD::UInt(texel.UInt(0) & SIMD::UInt(0xffff)) | (SIMD::UInt(texel.UInt(1) & SIMD::UInt(0xffff)) << 16);
+			numPackedElements = 1;
+			break;
+
 		case spv::ImageFormatR11fG11fB10f:
 		case spv::ImageFormatR16f:
 		case spv::ImageFormatRgba16:
@@ -937,12 +950,10 @@
 		case spv::ImageFormatRg8Snorm:
 		case spv::ImageFormatR16Snorm:
 		case spv::ImageFormatR8Snorm:
-		case spv::ImageFormatRg16i:
 		case spv::ImageFormatRg8i:
 		case spv::ImageFormatR16i:
 		case spv::ImageFormatR8i:
 		case spv::ImageFormatRgb10a2ui:
-		case spv::ImageFormatRg16ui:
 		case spv::ImageFormatRg8ui:
 		case spv::ImageFormatR16ui:
 		case spv::ImageFormatR8ui:

src/Vulkan/VkPhysicalDevice.cpp

diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 27fb17a..d0b7142 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -580,6 +580,9 @@
 		case VK_FORMAT_R32G32B32A32_UINT:
 		case VK_FORMAT_R32G32B32A32_SINT:
 		case VK_FORMAT_R32G32B32A32_SFLOAT:
+		case VK_FORMAT_R16G16_UINT:
+		case VK_FORMAT_R16G16_SINT:
+		case VK_FORMAT_R16G16_SFLOAT:
 			pFormatProperties->optimalTilingFeatures |=
 			    VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT;
 			// Fall through