From c895a169284730039c1d0b845ecb373f37c4f33d Mon Sep 17 00:00:00 2001 From: "Erik W. Gren" Date: Sun, 15 Dec 2024 09:34:51 +0100 Subject: [PATCH] consistency: rename Sfloat -> Float --- blade-graphics/src/gles/mod.rs | 2 +- blade-graphics/src/lib.rs | 2 +- blade-graphics/src/metal/mod.rs | 2 +- blade-graphics/src/util.rs | 2 +- blade-graphics/src/vulkan/mod.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/blade-graphics/src/gles/mod.rs b/blade-graphics/src/gles/mod.rs index de3134f..142cc9a 100644 --- a/blade-graphics/src/gles/mod.rs +++ b/blade-graphics/src/gles/mod.rs @@ -624,7 +624,7 @@ fn describe_texture_format(format: crate::TextureFormat) -> FormatInfo { Tf::Bc5Unorm => (glow::COMPRESSED_RG_RGTC2, glow::RG, 0), Tf::Bc5Snorm => (glow::COMPRESSED_SIGNED_RG_RGTC2, glow::RG, 0), Tf::Bc6hUfloat => (glow::COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT, glow::RGB, 0), - Tf::Bc6hSfloat => (glow::COMPRESSED_RGB_BPTC_SIGNED_FLOAT, glow::RGB, 0), + Tf::Bc6hFloat => (glow::COMPRESSED_RGB_BPTC_SIGNED_FLOAT, glow::RGB, 0), Tf::Bc7Unorm => (glow::COMPRESSED_RGBA_BPTC_UNORM, glow::RGBA, 0), Tf::Bc7UnormSrgb => (glow::COMPRESSED_SRGB_ALPHA_BPTC_UNORM, glow::RGBA, 0), Tf::Rgb10a2Unorm => ( diff --git a/blade-graphics/src/lib.rs b/blade-graphics/src/lib.rs index f6f8b18..b41ff6c 100644 --- a/blade-graphics/src/lib.rs +++ b/blade-graphics/src/lib.rs @@ -309,7 +309,7 @@ pub enum TextureFormat { Bc5Unorm, Bc5Snorm, Bc6hUfloat, - Bc6hSfloat, + Bc6hFloat, Bc7Unorm, Bc7UnormSrgb, // packed 32-bit diff --git a/blade-graphics/src/metal/mod.rs b/blade-graphics/src/metal/mod.rs index 72668ed..6cbf374 100644 --- a/blade-graphics/src/metal/mod.rs +++ b/blade-graphics/src/metal/mod.rs @@ -335,7 +335,7 @@ fn map_texture_format(format: crate::TextureFormat) -> metal::MTLPixelFormat { Tf::Bc5Unorm => BC5_RGUnorm, Tf::Bc5Snorm => BC5_RGSnorm, Tf::Bc6hUfloat => BC6H_RGBUfloat, - Tf::Bc6hSfloat => BC6H_RGBFloat, + Tf::Bc6hFloat => BC6H_RGBFloat, Tf::Bc7Unorm => BC7_RGBAUnorm, Tf::Bc7UnormSrgb => BC7_RGBAUnorm_sRGB, Tf::Rgb10a2Unorm => RGB10A2Unorm, diff --git a/blade-graphics/src/util.rs b/blade-graphics/src/util.rs index 4989d90..1eebb86 100644 --- a/blade-graphics/src/util.rs +++ b/blade-graphics/src/util.rs @@ -85,7 +85,7 @@ impl super::TextureFormat { Self::Bc5Unorm => cx_bc(16), Self::Bc5Snorm => cx_bc(16), Self::Bc6hUfloat => cx_bc(16), - Self::Bc6hSfloat => cx_bc(16), + Self::Bc6hFloat => cx_bc(16), Self::Bc7Unorm => cx_bc(16), Self::Bc7UnormSrgb => cx_bc(16), Self::Rgb10a2Unorm => uncompressed(4), diff --git a/blade-graphics/src/vulkan/mod.rs b/blade-graphics/src/vulkan/mod.rs index 95d962a..5c9b133 100644 --- a/blade-graphics/src/vulkan/mod.rs +++ b/blade-graphics/src/vulkan/mod.rs @@ -558,7 +558,7 @@ fn map_texture_format(format: crate::TextureFormat) -> vk::Format { Tf::Bc5Unorm => vk::Format::BC5_UNORM_BLOCK, Tf::Bc5Snorm => vk::Format::BC5_SNORM_BLOCK, Tf::Bc6hUfloat => vk::Format::BC6H_UFLOAT_BLOCK, - Tf::Bc6hSfloat => vk::Format::BC6H_SFLOAT_BLOCK, + Tf::Bc6hFloat => vk::Format::BC6H_SFLOAT_BLOCK, Tf::Bc7Unorm => vk::Format::BC7_UNORM_BLOCK, Tf::Bc7UnormSrgb => vk::Format::BC7_SRGB_BLOCK, Tf::Rgb10a2Unorm => vk::Format::A2R10G10B10_UNORM_PACK32,