github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prevent 3D compressed textures

Browse Source
This commit is contained in:
Connor Fitzgerald
2022-02-24 16:51:10 -05:00
committed by Dzmitry Malyshau
parent 4d7f6eb07a
commit 129c32ffc3
3 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wgpu-core/src/device/mod.rs
View File

@@ -642,7 +642,7 @@ impl<A: HalApi> Device<A> {
if desc.dimension != wgt::TextureDimension::D2 {
// Depth textures can only be 2D
if format_desc.sample_type == wgt::TextureSampleType::Depth {
return Err(resource::CreateTextureError::InvalidDepthKind(
return Err(resource::CreateTextureError::InvalidDepthDimension(
desc.dimension,
desc.format,
));
@@ -654,6 +654,14 @@ impl<A: HalApi> Device<A> {
desc.dimension,
));
}
// Compressed textures can only be 2D
if format_desc.is_compressed() {
return Err(resource::CreateTextureError::InvalidCompressedDimension(
desc.dimension,
desc.format,
));
}
}
let format_features = self

6
wgpu-core/src/resource.rs
View File

@@ -299,8 +299,10 @@ pub enum CreateTextureError {
EmptyUsage,
#[error(transparent)]
InvalidDimension(#[from] TextureDimensionError),
#[error("Depth texture kind {0:?} of format {0:?} can't be created")]
InvalidDepthKind(wgt::TextureDimension, wgt::TextureFormat),
#[error("Depth texture ({1:?}) can't be created as {0:?}")]
InvalidDepthDimension(wgt::TextureDimension, wgt::TextureFormat),
#[error("Compressed texture ({1:?}) can't be created as {0:?}")]
InvalidCompressedDimension(wgt::TextureDimension, wgt::TextureFormat),
#[error(
"Texture descriptor mip level count {requested} is invalid, maximum allowed is {maximum}"
)]

42
wgpu/tests/clear_texture.rs
View File

@@ -270,31 +270,29 @@ fn clear_texture_tests(
},
wgpu::TextureDimension::D2,
);
// 2D array texture
single_texture_clear_test(
ctx,
format,
wgpu::Extent3d {
width: 64,
height: 64,
depth_or_array_layers: 4,
},
wgpu::TextureDimension::D2,
);
if supports_3d {
// 2D array texture
// volume texture
single_texture_clear_test(
ctx,
format,
wgpu::Extent3d {
width: 64,
height: 64,
depth_or_array_layers: 4,
width: 16,
height: 16,
depth_or_array_layers: 16,
},
wgpu::TextureDimension::D2,
wgpu::TextureDimension::D3,
);
// volume texture
if format.describe().sample_type != wgt::TextureSampleType::Depth {
single_texture_clear_test(
ctx,
format,
wgpu::Extent3d {
width: 16,
height: 16,
depth_or_array_layers: 16,
},
wgpu::TextureDimension::D3,
);
}
}
}
}
@@ -305,7 +303,7 @@ fn clear_texture_2d_uncompressed() {
TestParameters::default().features(wgpu::Features::CLEAR_TEXTURE),
|ctx| {
clear_texture_tests(&ctx, TEXTURE_FORMATS_UNCOMPRESSED, true, true);
clear_texture_tests(&ctx, TEXTURE_FORMATS_DEPTH, false, true);
clear_texture_tests(&ctx, TEXTURE_FORMATS_DEPTH, false, false);
},
)
}
@@ -317,7 +315,7 @@ fn clear_texture_2d_bc() {
.features(wgpu::Features::CLEAR_TEXTURE | wgpu::Features::TEXTURE_COMPRESSION_BC)
.specific_failure(Some(wgpu::Backends::GL), None, Some("ANGLE"), false), // https://bugs.chromium.org/p/angleproject/issues/detail?id=7056
|ctx| {
clear_texture_tests(&ctx, TEXTURE_FORMATS_BC, false, true);
clear_texture_tests(&ctx, TEXTURE_FORMATS_BC, false, false);
},
)
}
@@ -329,7 +327,7 @@ fn clear_texture_2d_astc() {
.features(wgpu::Features::CLEAR_TEXTURE | wgpu::Features::TEXTURE_COMPRESSION_ASTC_LDR)
.specific_failure(Some(wgpu::Backends::GL), None, Some("ANGLE"), false), // https://bugs.chromium.org/p/angleproject/issues/detail?id=7056
|ctx| {
clear_texture_tests(&ctx, TEXTURE_FORMATS_ASTC, false, true);
clear_texture_tests(&ctx, TEXTURE_FORMATS_ASTC, false, false);
},
)
}
@@ -341,7 +339,7 @@ fn clear_texture_2d_etc2() {
.features(wgpu::Features::CLEAR_TEXTURE | wgpu::Features::TEXTURE_COMPRESSION_ETC2)
.specific_failure(Some(wgpu::Backends::GL), None, Some("ANGLE"), false), // https://bugs.chromium.org/p/angleproject/issues/detail?id=7056
|ctx| {
clear_texture_tests(&ctx, TEXTURE_FORMATS_ETC2, false, true);
clear_texture_tests(&ctx, TEXTURE_FORMATS_ETC2, false, false);
},
)
}