diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e36b9aab..e0537baa 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -154,7 +154,7 @@ jobs: key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: Install mdbook run: | - cargo install mdbook --no-default-features --features output --vers "^0.1.0" + cargo install --force mdbook --no-default-features --features output --vers "^0.1.0" - name: Build run: mdbook build - name: Deploy to maxammann.org diff --git a/src/render/platform_constants.rs b/src/render/platform_constants.rs index bf79319b..9203caa7 100644 --- a/src/render/platform_constants.rs +++ b/src/render/platform_constants.rs @@ -4,11 +4,12 @@ pub const COLOR_TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Bgra8 // WebGL #[cfg(all(target_arch = "wasm32", feature = "web-webgl"))] pub const COLOR_TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8UnormSrgb; -// Vulkan/Metal/OpenGL +// Vulkan/OpenGL #[cfg(target_os = "linux")] pub const COLOR_TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Bgra8UnormSrgb; -#[cfg(target_arch = "aarch64")] +// macOS and iOS (Metal) +#[cfg(all(target_arch = "aarch64", not(target_os = "android")))] pub const COLOR_TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Bgra8UnormSrgb; #[cfg(target_os = "android")]