Re-Enable Mac CI (#5015)

This commit is contained in:
Connor Fitzgerald 2024-01-08 16:12:57 -05:00 committed by GitHub
parent c6eea50b04
commit a01ff0741c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View File

@ -362,8 +362,8 @@ jobs:
os: windows-2022
# Mac
# - name: Mac aarch64
# os: macos-12
- name: Mac aarch64
os: macos-13-xlarge
# Linux
- name: Linux x86_64

View File

@ -50,7 +50,8 @@ impl NativeTest {
let env_value = if metal_validation { "1" } else { "0" };
std::env::set_var("MTL_DEBUG_LAYER", env_value);
std::env::set_var("MTL_SHADER_VALIDATION", env_value);
// Metal Shader Validation is entirely broken in the paravirtualized CI environment.
// std::env::set_var("MTL_SHADER_VALIDATION", env_value);
execute_test(config, Some(test_info), adapter_index).await;
}),

View File

@ -362,6 +362,8 @@ static CLEAR_TEXTURE_DEPTH: GpuTestConfiguration = GpuTestConfiguration::new()
wgpu::DownlevelFlags::DEPTH_TEXTURE_AND_BUFFER_COPIES
| wgpu::DownlevelFlags::COMPUTE_SHADERS,
)
// https://github.com/gfx-rs/wgpu/issues/5016
.skip(FailureCase::adapter("Apple Paravirtual device"))
.skip(FailureCase::webgl2())
.limits(wgpu::Limits::downlevel_defaults())
.features(wgpu::Features::CLEAR_TEXTURE),
@ -374,7 +376,9 @@ static CLEAR_TEXTURE_DEPTH: GpuTestConfiguration = GpuTestConfiguration::new()
static CLEAR_TEXTURE_DEPTH32_STENCIL8: GpuTestConfiguration = GpuTestConfiguration::new()
.parameters(
TestParameters::default()
.features(wgpu::Features::CLEAR_TEXTURE | wgpu::Features::DEPTH32FLOAT_STENCIL8),
.features(wgpu::Features::CLEAR_TEXTURE | wgpu::Features::DEPTH32FLOAT_STENCIL8)
// https://github.com/gfx-rs/wgpu/issues/5016
.skip(FailureCase::adapter("Apple Paravirtual device")),
)
.run_sync(|ctx| {
clear_texture_tests(&ctx, &[wgpu::TextureFormat::Depth32FloatStencil8]);