Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix M1 in macOS incorrectly reports supported compressed texture formats #2453

Merged
merged 3 commits into from
Feb 4, 2022
Merged

Fix M1 in macOS incorrectly reports supported compressed texture formats #2453

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cefdbb9
Metal: Correctly identify ASTC and EAC/ETC2 support
superdump Feb 3, 2022
bf0fbf8
Metal: Correctly expose ASTC / BC / EAC/ETC2 compressed texture support
superdump Feb 3, 2022
974b5d3
Metal: Only call supports_family when supported, and use Apple6 for A…
superdump Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions wgpu-hal/src/metal/adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,12 @@ impl super::PrivateCapabilities {
format_min_srgb_channels: if os_is_mac { 4 } else { 1 },
format_b5: !os_is_mac,
format_bc: os_is_mac,
format_eac_etc: !os_is_mac,
format_astc: Self::supports_any(device, ASTC_PIXEL_FORMAT_FEATURES),
format_eac_etc: !os_is_mac
// M1 in macOS supports EAC/ETC2
|| device.supports_family(MTLGPUFamily::Apple7),
superdump marked this conversation as resolved.
Show resolved Hide resolved
format_astc: Self::supports_any(device, ASTC_PIXEL_FORMAT_FEATURES)
// A14/M1 always support ASTC
|| device.supports_family(MTLGPUFamily::Apple7),
kvark marked this conversation as resolved.
Show resolved Hide resolved
superdump marked this conversation as resolved.
Show resolved Hide resolved
format_any8_unorm_srgb_all: Self::supports_any(device, ANY8_UNORM_SRGB_ALL),
format_any8_unorm_srgb_no_write: !Self::supports_any(device, ANY8_UNORM_SRGB_ALL)
&& !os_is_mac,
Expand Down Expand Up @@ -1010,7 +1014,6 @@ impl super::PrivateCapabilities {
use wgt::Features as F;

let mut features = F::empty()
| F::TEXTURE_COMPRESSION_BC
| F::INDIRECT_FIRST_INSTANCE
| F::MAPPABLE_PRIMARY_BUFFERS
| F::VERTEX_WRITABLE_STORAGE
Expand All @@ -1020,6 +1023,10 @@ impl super::PrivateCapabilities {
| F::CLEAR_TEXTURE
| F::TEXTURE_FORMAT_16BIT_NORM;

features.set(F::TEXTURE_COMPRESSION_ASTC_LDR, self.format_astc);
features.set(F::TEXTURE_COMPRESSION_BC, self.format_bc);
features.set(F::TEXTURE_COMPRESSION_ETC2, self.format_eac_etc);

features.set(F::DEPTH_CLIP_CONTROL, self.supports_depth_clip_control);

features.set(
Expand Down