From ff432416a233e8b9035227c497d36af0d7406f06 Mon Sep 17 00:00:00 2001
From: Josh Simmons <josh@nega.tv>
Date: Sun, 12 May 2024 13:48:34 +0200
Subject: [PATCH] narcissus-gpu: Add ImageFormat::BGRA16_FLOAT

---
 engine/narcissus-gpu/src/backend/vulkan/convert.rs | 10 ++++++----
 engine/narcissus-gpu/src/lib.rs                    |  5 +++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/engine/narcissus-gpu/src/backend/vulkan/convert.rs b/engine/narcissus-gpu/src/backend/vulkan/convert.rs
index 7726a05..a04a9b2 100644
--- a/engine/narcissus-gpu/src/backend/vulkan/convert.rs
+++ b/engine/narcissus-gpu/src/backend/vulkan/convert.rs
@@ -25,10 +25,11 @@ pub fn vulkan_format(format: ImageFormat) -> vk::Format {
         ImageFormat::R8_UNORM => vk::Format::R8_UNORM,
         ImageFormat::RGBA8_SRGB => vk::Format::R8G8B8A8_SRGB,
         ImageFormat::RGBA8_UNORM => vk::Format::R8G8B8A8_UNORM,
+        ImageFormat::RGBA16_FLOAT => vk::Format::R16G16B16A16_SFLOAT,
         ImageFormat::BGRA8_SRGB => vk::Format::B8G8R8A8_SRGB,
         ImageFormat::BGRA8_UNORM => vk::Format::B8G8R8A8_UNORM,
-        ImageFormat::A2R10G10B10_UNORM_PACK32 => vk::Format::A2R10G10B10_UNORM_PACK32,
-        ImageFormat::A2B10G10R10_UNORM_PACK32 => vk::Format::A2B10G10R10_UNORM_PACK32,
+        ImageFormat::A2R10G10B10_UNORM => vk::Format::A2R10G10B10_UNORM_PACK32,
+        ImageFormat::A2B10G10R10_UNORM => vk::Format::A2B10G10R10_UNORM_PACK32,
         ImageFormat::DEPTH_F32 => vk::Format::D32_SFLOAT,
     }
 }
@@ -41,8 +42,9 @@ pub fn vulkan_aspect_for_format(format: ImageFormat) -> vk::ImageAspectFlags {
         | ImageFormat::BGRA8_UNORM
         | ImageFormat::RGBA8_SRGB
         | ImageFormat::RGBA8_UNORM
-        | ImageFormat::A2R10G10B10_UNORM_PACK32
-        | ImageFormat::A2B10G10R10_UNORM_PACK32 => vk::ImageAspectFlags::COLOR,
+        | ImageFormat::RGBA16_FLOAT
+        | ImageFormat::A2R10G10B10_UNORM
+        | ImageFormat::A2B10G10R10_UNORM => vk::ImageAspectFlags::COLOR,
         ImageFormat::DEPTH_F32 => vk::ImageAspectFlags::DEPTH,
     }
 }
diff --git a/engine/narcissus-gpu/src/lib.rs b/engine/narcissus-gpu/src/lib.rs
index 13fa86b..b8d2c42 100644
--- a/engine/narcissus-gpu/src/lib.rs
+++ b/engine/narcissus-gpu/src/lib.rs
@@ -129,8 +129,9 @@ pub enum ImageFormat {
     BGRA8_UNORM,
     RGBA8_SRGB,
     RGBA8_UNORM,
-    A2R10G10B10_UNORM_PACK32,
-    A2B10G10R10_UNORM_PACK32,
+    RGBA16_FLOAT,
+    A2R10G10B10_UNORM,
+    A2B10G10R10_UNORM,
     DEPTH_F32,
 }
 
-- 
2.49.0