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

Build fixes after a bad merge (#2071)

Browse Source
This commit is contained in:
Dzmitry Malyshau 2021-10-14 19:24:30 -04:00 committed by GitHub
parent 47fb0efb2c
commit ec8413dfcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgpu-core/src/command/clear.rs
View File

@ -298,7 +298,7 @@ pub(crate) fn collect_zero_buffer_copies_for_clear_texture(
let bytes_per_row = align_to(
// row is at least one block wide, need to round up
(mip_size.width + format_desc.block_dimensions.1 as u32 - 1)
(mip_size.width + format_desc.block_dimensions.0 as u32 - 1)
/ format_desc.block_dimensions.0 as u32
* format_desc.block_size as u32,
bytes_per_row_alignment,

18
wgpu/tests/clear_texture.rs
View File

@ -62,14 +62,16 @@ static TEXTURE_FORMATS_BC: &[wgpu::TextureFormat] = &[
// needs TEXTURE_COMPRESSION_ETC2
static TEXTURE_FORMATS_ETC2: &[wgpu::TextureFormat] = &[
wgpu::TextureFormat::Etc2RgbUnorm,
wgpu::TextureFormat::Etc2RgbUnormSrgb,
wgpu::TextureFormat::Etc2RgbA1Unorm,
wgpu::TextureFormat::Etc2RgbA1UnormSrgb,
wgpu::TextureFormat::EacRUnorm,
wgpu::TextureFormat::EacRSnorm,
wgpu::TextureFormat::EacRgUnorm,
wgpu::TextureFormat::EacRgSnorm,
wgpu::TextureFormat::Etc2Rgb8Unorm,
wgpu::TextureFormat::Etc2Rgb8UnormSrgb,
wgpu::TextureFormat::Etc2Rgb8A1Unorm,
wgpu::TextureFormat::Etc2Rgb8A1UnormSrgb,
wgpu::TextureFormat::Etc2Rgba8Unorm,
wgpu::TextureFormat::Etc2Rgba8UnormSrgb,
wgpu::TextureFormat::EacR11Unorm,
wgpu::TextureFormat::EacR11Snorm,
wgpu::TextureFormat::EacRg11Unorm,
wgpu::TextureFormat::EacRg11Snorm,
];
// needs TEXTURE_COMPRESSION_ASTC_LDR