]> git.nega.tv - josh/narcissus/commitdiff
narcissus-gpu: Add ImageFormat::BGRA16_FLOAT
authorJosh Simmons <josh@nega.tv>
Sun, 12 May 2024 11:48:34 +0000 (13:48 +0200)
committerJosh Simmons <josh@nega.tv>
Sun, 12 May 2024 11:48:34 +0000 (13:48 +0200)
engine/narcissus-gpu/src/backend/vulkan/convert.rs
engine/narcissus-gpu/src/lib.rs

index 7726a05c66848cf8133b819defc3117d792ccb2a..a04a9b225116396de5bc2521c9388c728b611d40 100644 (file)
@@ -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,
     }
 }
index 13fa86b4039c2892c0024f405171ff7b0a68bf5c..b8d2c42c357084404cc49731e40789a22773ba7c 100644 (file)
@@ -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,
 }