From 48c03e05287675e5577133613d2b334d6aa5f592 Mon Sep 17 00:00:00 2001 From: Jinlei Li Date: Tue, 23 Aug 2022 20:15:43 +0800 Subject: [PATCH] metal: remove PrivateCapabilities's format_rgb10a2_unorm_surface field --- wgpu-hal/src/metal/adapter.rs | 3 +-- wgpu-hal/src/metal/mod.rs | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/wgpu-hal/src/metal/adapter.rs b/wgpu-hal/src/metal/adapter.rs index 2b530695972..e0ba909cd49 100644 --- a/wgpu-hal/src/metal/adapter.rs +++ b/wgpu-hal/src/metal/adapter.rs @@ -286,7 +286,7 @@ impl crate::Adapter for super::Adapter { wgt::TextureFormat::Bgra8UnormSrgb, wgt::TextureFormat::Rgba16Float, ]; - if self.shared.private_caps.format_rgb10a2_unorm_surface { + if self.shared.private_caps.format_rgb10a2_unorm_all { formats.push(wgt::TextureFormat::Rgb10a2Unorm); } @@ -580,7 +580,6 @@ impl super::PrivateCapabilities { format_rgba8_srgb_no_write: !Self::supports_any(device, RGBA8_SRGB), format_rgb10a2_unorm_all: Self::supports_any(device, RGB10A2UNORM_ALL), format_rgb10a2_unorm_no_write: !Self::supports_any(device, RGB10A2UNORM_ALL), - format_rgb10a2_unorm_surface: os_is_mac, format_rgb10a2_uint_color: !Self::supports_any(device, RGB10A2UINT_COLOR_WRITE), format_rgb10a2_uint_color_write: Self::supports_any(device, RGB10A2UINT_COLOR_WRITE), format_rg11b10_all: Self::supports_any(device, RG11B10FLOAT_ALL), diff --git a/wgpu-hal/src/metal/mod.rs b/wgpu-hal/src/metal/mod.rs index 1ea8312b9f7..540980a5a4f 100644 --- a/wgpu-hal/src/metal/mod.rs +++ b/wgpu-hal/src/metal/mod.rs @@ -180,7 +180,6 @@ struct PrivateCapabilities { format_rgba8_srgb_no_write: bool, format_rgb10a2_unorm_all: bool, format_rgb10a2_unorm_no_write: bool, - format_rgb10a2_unorm_surface: bool, format_rgb10a2_uint_color: bool, format_rgb10a2_uint_color_write: bool, format_rg11b10_all: bool,