Skip to content

Commit 2a62299

Browse files
mehmetoguzderinmehmetoguzderin
authored
Support Sliced 3D for ASTC (#7577)
Enables "texture-compression-astc-sliced-3d" for backends that support ASTC (such as excluding D3D12).
1 parent 50eb207 commit 2a62299

File tree

12 files changed

+131
-9
lines changed

12 files changed

+131
-9
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Bottom level categories:
4444

4545
#### General
4646

47+
- Add support for astc-sliced-3d feature. By @mehmetoguzderin in [#7577](https://github.com/gfx-rs/wgpu/issues/7577)
4748
- Add support for rendering to slices of 3D texture views and single layered 2D-Array texture views (this requires `VK_KHR_maintenance1` which should be widely available on newer drivers). By @teoxoy in [#7596](https://github.com/gfx-rs/wgpu/pull/7596)
4849

4950
#### Naga

‎deno_webgpu/webgpu.idl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ enum GPUFeatureName {
9999
"texture-compression-bc-sliced-3d",
100100
"texture-compression-etc2",
101101
"texture-compression-astc",
102+
"texture-compression-astc-sliced-3d",
102103
"timestamp-query",
103104
"indirect-first-instance",
104105
"shader-f16",

‎deno_webgpu/webidl.rs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,8 @@ pub enum GPUFeatureName {
359359
TextureCompressionEtc2,
360360
#[webidl(rename = "texture-compression-astc")]
361361
TextureCompressionAstc,
362+
#[webidl(rename = "texture-compression-astc-sliced-3d")]
363+
TextureCompressionAstcSliced3d,
362364
#[webidl(rename = "rg11b10ufloat-renderable")]
363365
Rg11b10ufloatRenderable,
364366
#[webidl(rename = "bgra8unorm-storage")]
@@ -451,6 +453,7 @@ pub fn feature_names_to_features(names: Vec<GPUFeatureName>) -> wgpu_types::Feat
451453
GPUFeatureName::TextureCompressionBcSliced3d => Features::TEXTURE_COMPRESSION_BC_SLICED_3D,
452454
GPUFeatureName::TextureCompressionEtc2 => Features::TEXTURE_COMPRESSION_ETC2,
453455
GPUFeatureName::TextureCompressionAstc => Features::TEXTURE_COMPRESSION_ASTC,
456+
GPUFeatureName::TextureCompressionAstcSliced3d => Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D,
454457
GPUFeatureName::Rg11b10ufloatRenderable => Features::RG11B10UFLOAT_RENDERABLE,
455458
GPUFeatureName::Bgra8unormStorage => Features::BGRA8UNORM_STORAGE,
456459
GPUFeatureName::Float32Filterable => Features::FLOAT32_FILTERABLE,
@@ -529,6 +532,9 @@ pub fn features_to_feature_names(features: wgpu_types::Features) -> HashSet<GPUF
529532
if features.contains(wgpu_types::Features::TEXTURE_COMPRESSION_ASTC) {
530533
return_features.insert(TextureCompressionAstc);
531534
}
535+
if features.contains(wgpu_types::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D) {
536+
return_features.insert(TextureCompressionAstcSliced3d);
537+
}
532538
if features.contains(wgpu_types::Features::RG11B10UFLOAT_RENDERABLE) {
533539
return_features.insert(Rg11b10ufloatRenderable);
534540
}

‎tests/tests/wgpu-gpu/clear_texture.rs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,9 +405,14 @@ static CLEAR_TEXTURE_COMPRESSED_BCN: GpuTestConfiguration = GpuTestConfiguration
405405
static CLEAR_TEXTURE_COMPRESSED_ASTC: GpuTestConfiguration = GpuTestConfiguration::new()
406406
.parameters(
407407
TestParameters::default()
408-
.features(wgpu::Features::CLEAR_TEXTURE | wgpu::Features::TEXTURE_COMPRESSION_ASTC)
408+
.features(
409+
wgpu::Features::CLEAR_TEXTURE
410+
| wgpu::Features::TEXTURE_COMPRESSION_ASTC
411+
| wgpu::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D,
412+
)
409413
.limits(wgpu::Limits {
410414
max_texture_dimension_2d: wgpu::COPY_BYTES_PER_ROW_ALIGNMENT * 12,
415+
max_texture_dimension_3d: wgpu::COPY_BYTES_PER_ROW_ALIGNMENT * 12,
411416
..wgpu::Limits::downlevel_defaults()
412417
})
413418
// https://bugs.chromium.org/p/angleproject/issues/detail?id=7056

‎wgpu-core/src/device/resource.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,9 @@ impl Device {
979979
if desc.format.is_bcn() {
980980
self.require_features(wgt::Features::TEXTURE_COMPRESSION_BC_SLICED_3D)
981981
.map_err(|error| CreateTextureError::MissingFeatures(desc.format, error))?;
982+
} else if desc.format.is_astc() {
983+
self.require_features(wgt::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D)
984+
.map_err(|error| CreateTextureError::MissingFeatures(desc.format, error))?;
982985
} else {
983986
return Err(CreateTextureError::InvalidCompressedDimension(
984987
desc.dimension,

‎wgpu-hal/src/gles/adapter.rs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ impl super::Adapter {
531531
.compressed_texture_astc_supports_ldr_profile()
532532
{
533533
features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC);
534+
features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D);
534535
}
535536
if context
536537
.glow_context
@@ -543,13 +544,19 @@ impl super::Adapter {
543544
#[cfg(any(native, Emscripten))]
544545
{
545546
features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC);
547+
features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D);
546548
features.insert(wgt::Features::TEXTURE_COMPRESSION_ASTC_HDR);
547549
}
548550
} else {
549551
features.set(
550552
wgt::Features::TEXTURE_COMPRESSION_ASTC,
551553
extensions.contains("GL_KHR_texture_compression_astc_ldr"),
552554
);
555+
features.set(
556+
wgt::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D,
557+
extensions.contains("GL_KHR_texture_compression_astc_ldr")
558+
&& extensions.contains("GL_KHR_texture_compression_astc_sliced_3d"),
559+
);
553560
features.set(
554561
wgt::Features::TEXTURE_COMPRESSION_ASTC_HDR,
555562
extensions.contains("GL_KHR_texture_compression_astc_hdr"),

‎wgpu-hal/src/metal/adapter.rs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,6 +667,8 @@ impl super::PrivateCapabilities {
667667
|| Self::supports_any(device, ASTC_PIXEL_FORMAT_FEATURES),
668668
// A13(Apple6) M1(Apple7) and later always support HDR ASTC pixel formats
669669
format_astc_hdr: family_check && device.supports_family(MTLGPUFamily::Apple6),
670+
// Apple3 and later supports compressed volume texture formats including ASTC Sliced 3D
671+
format_astc_3d: family_check && device.supports_family(MTLGPUFamily::Apple3),
670672
format_any8_unorm_srgb_all: Self::supports_any(device, ANY8_UNORM_SRGB_ALL),
671673
format_any8_unorm_srgb_no_write: !Self::supports_any(device, ANY8_UNORM_SRGB_ALL)
672674
&& !os_is_mac,
@@ -938,6 +940,7 @@ impl super::PrivateCapabilities {
938940
);
939941
features.set(F::TEXTURE_COMPRESSION_ASTC, self.format_astc);
940942
features.set(F::TEXTURE_COMPRESSION_ASTC_HDR, self.format_astc_hdr);
943+
features.set(F::TEXTURE_COMPRESSION_ASTC_SLICED_3D, self.format_astc_3d);
941944
features.set(F::TEXTURE_COMPRESSION_BC, self.format_bc);
942945
features.set(F::TEXTURE_COMPRESSION_BC_SLICED_3D, self.format_bc); // BC guarantees Sliced 3D
943946
features.set(F::TEXTURE_COMPRESSION_ETC2, self.format_eac_etc);

‎wgpu-hal/src/metal/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ struct PrivateCapabilities {
227227
format_eac_etc: bool,
228228
format_astc: bool,
229229
format_astc_hdr: bool,
230+
format_astc_3d: bool,
230231
format_any8_unorm_srgb_all: bool,
231232
format_any8_unorm_srgb_no_write: bool,
232233
format_any8_snorm_all: bool,

‎wgpu-hal/src/vulkan/adapter.rs‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -717,6 +717,13 @@ impl PhysicalDeviceFeatures {
717717
);
718718
}
719719

720+
if self.core.texture_compression_astc_ldr != 0 {
721+
features.set(
722+
F::TEXTURE_COMPRESSION_ASTC_SLICED_3D,
723+
supports_astc_3d(instance, phd),
724+
);
725+
}
726+
720727
if let Some((ref f16_i8, ref bit16)) = self.shader_float16 {
721728
features.set(
722729
F::SHADER_F16,
@@ -2604,6 +2611,60 @@ fn supports_format(
26042611
}
26052612
}
26062613

2614+
fn supports_astc_3d(instance: &ash::Instance, phd: vk::PhysicalDevice) -> bool {
2615+
let mut supports = true;
2616+
2617+
let astc_formats = [
2618+
vk::Format::ASTC_4X4_UNORM_BLOCK,
2619+
vk::Format::ASTC_4X4_SRGB_BLOCK,
2620+
vk::Format::ASTC_5X4_UNORM_BLOCK,
2621+
vk::Format::ASTC_5X4_SRGB_BLOCK,
2622+
vk::Format::ASTC_5X5_UNORM_BLOCK,
2623+
vk::Format::ASTC_5X5_SRGB_BLOCK,
2624+
vk::Format::ASTC_6X5_UNORM_BLOCK,
2625+
vk::Format::ASTC_6X5_SRGB_BLOCK,
2626+
vk::Format::ASTC_6X6_UNORM_BLOCK,
2627+
vk::Format::ASTC_6X6_SRGB_BLOCK,
2628+
vk::Format::ASTC_8X5_UNORM_BLOCK,
2629+
vk::Format::ASTC_8X5_SRGB_BLOCK,
2630+
vk::Format::ASTC_8X6_UNORM_BLOCK,
2631+
vk::Format::ASTC_8X6_SRGB_BLOCK,
2632+
vk::Format::ASTC_8X8_UNORM_BLOCK,
2633+
vk::Format::ASTC_8X8_SRGB_BLOCK,
2634+
vk::Format::ASTC_10X5_UNORM_BLOCK,
2635+
vk::Format::ASTC_10X5_SRGB_BLOCK,
2636+
vk::Format::ASTC_10X6_UNORM_BLOCK,
2637+
vk::Format::ASTC_10X6_SRGB_BLOCK,
2638+
vk::Format::ASTC_10X8_UNORM_BLOCK,
2639+
vk::Format::ASTC_10X8_SRGB_BLOCK,
2640+
vk::Format::ASTC_10X10_UNORM_BLOCK,
2641+
vk::Format::ASTC_10X10_SRGB_BLOCK,
2642+
vk::Format::ASTC_12X10_UNORM_BLOCK,
2643+
vk::Format::ASTC_12X10_SRGB_BLOCK,
2644+
vk::Format::ASTC_12X12_UNORM_BLOCK,
2645+
vk::Format::ASTC_12X12_SRGB_BLOCK,
2646+
];
2647+
2648+
for &format in &astc_formats {
2649+
let result = unsafe {
2650+
instance.get_physical_device_image_format_properties(
2651+
phd,
2652+
format,
2653+
vk::ImageType::TYPE_3D,
2654+
vk::ImageTiling::OPTIMAL,
2655+
vk::ImageUsageFlags::SAMPLED,
2656+
vk::ImageCreateFlags::empty(),
2657+
)
2658+
};
2659+
if result.is_err() {
2660+
supports = false;
2661+
break;
2662+
}
2663+
}
2664+
2665+
supports
2666+
}
2667+
26072668
fn supports_bgra8unorm_storage(
26082669
instance: &ash::Instance,
26092670
phd: vk::PhysicalDevice,

‎wgpu-types/src/features.rs‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,28 @@ mod webgpu_impl {
3737
pub const WEBGPU_FEATURE_TEXTURE_COMPRESSION_ASTC: u64 = 1 << 5;
3838

3939
#[doc(hidden)]
40-
pub const WEBGPU_FEATURE_TIMESTAMP_QUERY: u64 = 1 << 6;
40+
pub const WEBGPU_FEATURE_TEXTURE_COMPRESSION_ASTC_SLICED_3D: u64 = 1 << 6;
4141

4242
#[doc(hidden)]
43-
pub const WEBGPU_FEATURE_INDIRECT_FIRST_INSTANCE: u64 = 1 << 7;
43+
pub const WEBGPU_FEATURE_TIMESTAMP_QUERY: u64 = 1 << 7;
4444

4545
#[doc(hidden)]
46-
pub const WEBGPU_FEATURE_SHADER_F16: u64 = 1 << 8;
46+
pub const WEBGPU_FEATURE_INDIRECT_FIRST_INSTANCE: u64 = 1 << 8;
4747

4848
#[doc(hidden)]
49-
pub const WEBGPU_FEATURE_RG11B10UFLOAT_RENDERABLE: u64 = 1 << 9;
49+
pub const WEBGPU_FEATURE_SHADER_F16: u64 = 1 << 9;
5050

5151
#[doc(hidden)]
52-
pub const WEBGPU_FEATURE_BGRA8UNORM_STORAGE: u64 = 1 << 10;
52+
pub const WEBGPU_FEATURE_RG11B10UFLOAT_RENDERABLE: u64 = 1 << 10;
5353

5454
#[doc(hidden)]
55-
pub const WEBGPU_FEATURE_FLOAT32_FILTERABLE: u64 = 1 << 11;
55+
pub const WEBGPU_FEATURE_BGRA8UNORM_STORAGE: u64 = 1 << 11;
5656

5757
#[doc(hidden)]
58-
pub const WEBGPU_FEATURE_DUAL_SOURCE_BLENDING: u64 = 1 << 12;
58+
pub const WEBGPU_FEATURE_FLOAT32_FILTERABLE: u64 = 1 << 12;
59+
60+
#[doc(hidden)]
61+
pub const WEBGPU_FEATURE_DUAL_SOURCE_BLENDING: u64 = 1 << 13;
5962
}
6063

6164
macro_rules! bitflags_array_impl {
@@ -1294,13 +1297,33 @@ bitflags_array! {
12941297
/// Support for this feature guarantees availability of [`TextureUsages::COPY_SRC | TextureUsages::COPY_DST | TextureUsages::TEXTURE_BINDING`] for ASTC formats with Unorm/UnormSrgb channel type.
12951298
/// [`Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES`] may enable additional usages.
12961299
///
1300+
/// This feature does not guarantee availability of sliced 3d textures for ASTC formats.
1301+
/// If available, 3d support can be enabled by TEXTURE_COMPRESSION_ASTC_SLICED_3D feature.
1302+
///
12971303
/// Supported Platforms:
12981304
/// - Vulkan on Intel
12991305
/// - Mobile (some)
13001306
///
13011307
/// This is a web and native feature.
13021308
const TEXTURE_COMPRESSION_ASTC = WEBGPU_FEATURE_TEXTURE_COMPRESSION_ASTC;
13031309

1310+
1311+
/// Allows the 3d dimension for textures with ASTC compressed formats.
1312+
///
1313+
/// This feature must be used in combination with TEXTURE_COMPRESSION_ASTC to enable 3D textures with ASTC compression.
1314+
/// It does not enable the ASTC formats by itself.
1315+
///
1316+
/// Supported Platforms:
1317+
/// - Vulkan (some)
1318+
/// - Metal on Apple3+
1319+
/// - OpenGL/WebGL (some)
1320+
///
1321+
/// Not Supported:
1322+
/// - DX12
1323+
///
1324+
/// This is a web and native feature.
1325+
const TEXTURE_COMPRESSION_ASTC_SLICED_3D = WEBGPU_FEATURE_TEXTURE_COMPRESSION_ASTC_SLICED_3D;
1326+
13041327
/// Enables use of Timestamp Queries. These queries tell the current gpu timestamp when
13051328
/// all work before the query is finished.
13061329
///

0 commit comments

Comments
 (0)