nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-02-16 17:02:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk: fix ASTC format mapping

Browse Source
This commit is contained in:
Dzmitry Malyshau 2022-02-13 00:18:16 -05:00
parent a604535972
commit 046f008cc0
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wgpu-hal/src/vulkan/conv.rs
View File

@ -101,12 +101,12 @@ impl super::PrivateCapabilities {
Tf::Astc8x5RgbaUnormSrgb => F::ASTC_8X5_SRGB_BLOCK,
Tf::Astc8x6RgbaUnorm => F::ASTC_8X6_UNORM_BLOCK,
Tf::Astc8x6RgbaUnormSrgb => F::ASTC_8X6_SRGB_BLOCK,
Tf::Astc10x5RgbaUnorm => F::ASTC_8X8_UNORM_BLOCK,
Tf::Astc10x5RgbaUnormSrgb => F::ASTC_8X8_SRGB_BLOCK,
Tf::Astc10x6RgbaUnorm => F::ASTC_10X5_UNORM_BLOCK,
Tf::Astc10x6RgbaUnormSrgb => F::ASTC_10X5_SRGB_BLOCK,
Tf::Astc8x8RgbaUnorm => F::ASTC_10X6_UNORM_BLOCK,
Tf::Astc8x8RgbaUnormSrgb => F::ASTC_10X6_SRGB_BLOCK,
Tf::Astc8x8RgbaUnorm => F::ASTC_8X8_UNORM_BLOCK,
Tf::Astc8x8RgbaUnormSrgb => F::ASTC_8X8_SRGB_BLOCK,
Tf::Astc10x5RgbaUnorm => F::ASTC_10X5_UNORM_BLOCK,
Tf::Astc10x5RgbaUnormSrgb => F::ASTC_10X5_SRGB_BLOCK,
Tf::Astc10x6RgbaUnorm => F::ASTC_10X6_UNORM_BLOCK,
Tf::Astc10x6RgbaUnormSrgb => F::ASTC_10X6_SRGB_BLOCK,
Tf::Astc10x8RgbaUnorm => F::ASTC_10X8_UNORM_BLOCK,
Tf::Astc10x8RgbaUnormSrgb => F::ASTC_10X8_SRGB_BLOCK,
Tf::Astc10x10RgbaUnorm => F::ASTC_10X10_UNORM_BLOCK,

3
wgpu-hal/src/vulkan/instance.rs
View File

@ -102,6 +102,9 @@ unsafe extern "system" fn debug_utils_messenger_callback(
log::log!(level, "\tobjects: {}", names.join(", "));
}
// uncommenting this is useful for tests
//assert_ne!(level, log::Level::Error);
vk::FALSE
}

24
wgpu-types/src/lib.rs
View File

@ -1909,6 +1909,18 @@ pub enum TextureFormat {
/// [`Features::TEXTURE_COMPRESSION_ASTC_LDR`] must be enabled to use this texture format.
#[cfg_attr(feature = "serde", serde(rename = "astc-8x6-unorm-srgb"))]
Astc8x6RgbaUnormSrgb,
/// 8x8 block compressed texture. 16 bytes per block (2 bit/px). Complex pallet. 8 bit integer RGBA.
/// [0, 255] converted to/from float [0, 1] in shader.
///
/// [`Features::TEXTURE_COMPRESSION_ASTC_LDR`] must be enabled to use this texture format.
#[cfg_attr(feature = "serde", serde(rename = "astc-8x8-unorm"))]
Astc8x8RgbaUnorm,
/// 8x8 block compressed texture. 16 bytes per block (2 bit/px). Complex pallet. 8 bit integer RGBA.
/// Srgb-color [0, 255] converted to/from linear-color float [0, 1] in shader.
///
/// [`Features::TEXTURE_COMPRESSION_ASTC_LDR`] must be enabled to use this texture format.
#[cfg_attr(feature = "serde", serde(rename = "astc-8x8-unorm-srgb"))]
Astc8x8RgbaUnormSrgb,
/// 10x5 block compressed texture. 16 bytes per block (2.56 bit/px). Complex pallet. 8 bit integer RGBA.
/// [0, 255] converted to/from float [0, 1] in shader.
///
@ -1933,18 +1945,6 @@ pub enum TextureFormat {
/// [`Features::TEXTURE_COMPRESSION_ASTC_LDR`] must be enabled to use this texture format.
#[cfg_attr(feature = "serde", serde(rename = "astc-10x6-unorm-srgb"))]
Astc10x6RgbaUnormSrgb,
/// 8x8 block compressed texture. 16 bytes per block (2 bit/px). Complex pallet. 8 bit integer RGBA.
/// [0, 255] converted to/from float [0, 1] in shader.
///
/// [`Features::TEXTURE_COMPRESSION_ASTC_LDR`] must be enabled to use this texture format.
#[cfg_attr(feature = "serde", serde(rename = "astc-8x8-unorm"))]
Astc8x8RgbaUnorm,
/// 8x8 block compressed texture. 16 bytes per block (2 bit/px). Complex pallet. 8 bit integer RGBA.
/// Srgb-color [0, 255] converted to/from linear-color float [0, 1] in shader.
///
/// [`Features::TEXTURE_COMPRESSION_ASTC_LDR`] must be enabled to use this texture format.
#[cfg_attr(feature = "serde", serde(rename = "astc-8x8-unorm-srgb"))]
Astc8x8RgbaUnormSrgb,
/// 10x8 block compressed texture. 16 bytes per block (1.6 bit/px). Complex pallet. 8 bit integer RGBA.
/// [0, 255] converted to/from float [0, 1] in shader.
///