mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-19 05:51:03 +01:00
chore: Sort feature flags (#10475)
This commit is contained in:
1 parent
6726fa78ba
commit
d1c95d96cd
5 files changed
+102
-101
No files matched your search
@@ -458,34 +458,34 @@ impl super::Adapter {
|
||||
|
||||
// these should always be available on d3d12
|
||||
let mut features = wgt::Features::empty()
|
||||
| wgt::Features::DEPTH_CLIP_CONTROL
|
||||
| wgt::Features::DEPTH32FLOAT_STENCIL8
|
||||
| wgt::Features::INDIRECT_FIRST_INSTANCE
|
||||
| wgt::Features::MAPPABLE_PRIMARY_BUFFERS
|
||||
| wgt::Features::MULTI_DRAW_INDIRECT_COUNT
|
||||
| wgt::Features::ADDRESS_MODE_CLAMP_TO_BORDER
|
||||
| wgt::Features::ADDRESS_MODE_CLAMP_TO_ZERO
|
||||
| wgt::Features::POLYGON_MODE_LINE
|
||||
| wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| wgt::Features::TIMESTAMP_QUERY
|
||||
| wgt::Features::TIMESTAMP_QUERY_INSIDE_ENCODERS
|
||||
| wgt::Features::TIMESTAMP_QUERY_INSIDE_PASSES
|
||||
| wgt::Features::TEXTURE_COMPRESSION_BC
|
||||
| wgt::Features::TEXTURE_COMPRESSION_BC_SLICED_3D
|
||||
| wgt::Features::CLEAR_TEXTURE
|
||||
| wgt::Features::TEXTURE_FORMAT_16BIT_NORM
|
||||
| wgt::Features::DEPTH32FLOAT_STENCIL8
|
||||
| wgt::Features::DEPTH_CLIP_CONTROL
|
||||
| wgt::Features::DUAL_SOURCE_BLENDING
|
||||
| wgt::Features::EXTERNAL_TEXTURE
|
||||
| wgt::Features::FLOAT32_BLENDABLE
|
||||
| wgt::Features::FLOAT32_FILTERABLE
|
||||
| wgt::Features::IMMEDIATES
|
||||
| wgt::Features::INDIRECT_FIRST_INSTANCE
|
||||
| wgt::Features::MAPPABLE_PRIMARY_BUFFERS
|
||||
| wgt::Features::MEMORY_DECORATION_COHERENT
|
||||
| wgt::Features::MULTI_DRAW_INDIRECT_COUNT
|
||||
| wgt::Features::PASSTHROUGH_SHADERS
|
||||
| wgt::Features::POLYGON_MODE_LINE
|
||||
| wgt::Features::PRIMITIVE_INDEX
|
||||
| wgt::Features::RG11B10UFLOAT_RENDERABLE
|
||||
| wgt::Features::DUAL_SOURCE_BLENDING
|
||||
| wgt::Features::TEXTURE_FORMAT_NV12
|
||||
| wgt::Features::FLOAT32_FILTERABLE
|
||||
| wgt::Features::FLOAT32_BLENDABLE
|
||||
| wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| wgt::Features::TEXTURE_ATOMIC
|
||||
| wgt::Features::PASSTHROUGH_SHADERS
|
||||
| wgt::Features::EXTERNAL_TEXTURE
|
||||
| wgt::Features::MEMORY_DECORATION_COHERENT
|
||||
| wgt::Features::TEXTURE_COMPONENT_SWIZZLE;
|
||||
| wgt::Features::TEXTURE_COMPONENT_SWIZZLE
|
||||
| wgt::Features::TEXTURE_COMPRESSION_BC
|
||||
| wgt::Features::TEXTURE_COMPRESSION_BC_SLICED_3D
|
||||
| wgt::Features::TEXTURE_FORMAT_16BIT_NORM
|
||||
| wgt::Features::TEXTURE_FORMAT_NV12
|
||||
| wgt::Features::TIMESTAMP_QUERY
|
||||
| wgt::Features::TIMESTAMP_QUERY_INSIDE_ENCODERS
|
||||
| wgt::Features::TIMESTAMP_QUERY_INSIDE_PASSES;
|
||||
|
||||
//TODO: in order to expose this, we need to run a compute shader
|
||||
// that extract the necessary statistics out of the D3D12 result.
|
||||
|
||||
@@ -384,10 +384,10 @@ impl super::Adapter {
|
||||
|| (supported((3, 1), (4, 0)) && extensions.contains("GL_EXT_texture_cube_map_array"));
|
||||
|
||||
let mut downlevel_flags = wgt::DownlevelFlags::empty()
|
||||
| wgt::DownlevelFlags::NON_POWER_OF_TWO_MIPMAPPED_TEXTURES
|
||||
| wgt::DownlevelFlags::COMPARISON_SAMPLERS
|
||||
| wgt::DownlevelFlags::SHADER_F16_IN_F32
|
||||
| wgt::DownlevelFlags::MSL2_1;
|
||||
| wgt::DownlevelFlags::MSL2_1
|
||||
| wgt::DownlevelFlags::NON_POWER_OF_TWO_MIPMAPPED_TEXTURES
|
||||
| wgt::DownlevelFlags::SHADER_F16_IN_F32;
|
||||
downlevel_flags.set(
|
||||
wgt::DownlevelFlags::CUBE_ARRAY_TEXTURES,
|
||||
supports_cube_array,
|
||||
@@ -487,11 +487,11 @@ impl super::Adapter {
|
||||
};
|
||||
|
||||
let mut features = wgt::Features::empty()
|
||||
| wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| wgt::Features::CLEAR_TEXTURE
|
||||
| wgt::Features::IMMEDIATES
|
||||
| wgt::Features::DEPTH32FLOAT_STENCIL8
|
||||
| wgt::Features::PASSTHROUGH_SHADERS;
|
||||
| wgt::Features::IMMEDIATES
|
||||
| wgt::Features::PASSTHROUGH_SHADERS
|
||||
| wgt::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES;
|
||||
features.set(
|
||||
wgt::Features::TEXTURE_FORMAT_16BIT_NORM,
|
||||
supports_16bit_norm,
|
||||
|
||||
@@ -1243,22 +1243,22 @@ impl super::CapabilitiesQuery {
|
||||
use wgt::Features as F;
|
||||
|
||||
let mut features = F::empty()
|
||||
| F::MAPPABLE_PRIMARY_BUFFERS
|
||||
| F::VERTEX_WRITABLE_STORAGE
|
||||
| F::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| F::IMMEDIATES
|
||||
| F::POLYGON_MODE_LINE
|
||||
| F::ADDRESS_MODE_CLAMP_TO_ZERO
|
||||
| F::BGRA8UNORM_STORAGE
|
||||
| F::CLEAR_TEXTURE
|
||||
| F::TEXTURE_FORMAT_16BIT_NORM
|
||||
| F::CLIP_DISTANCES
|
||||
| F::DEPTH32FLOAT_STENCIL8
|
||||
| F::EXTERNAL_TEXTURE
|
||||
| F::FLOAT32_BLENDABLE
|
||||
| F::IMMEDIATES
|
||||
| F::MAPPABLE_PRIMARY_BUFFERS
|
||||
| F::PASSTHROUGH_SHADERS
|
||||
| F::POLYGON_MODE_LINE
|
||||
| F::SHADER_F16
|
||||
| F::SHADER_I16
|
||||
| F::DEPTH32FLOAT_STENCIL8
|
||||
| F::BGRA8UNORM_STORAGE
|
||||
| F::PASSTHROUGH_SHADERS
|
||||
| F::FLOAT32_BLENDABLE
|
||||
| F::CLIP_DISTANCES
|
||||
| F::ADDRESS_MODE_CLAMP_TO_ZERO
|
||||
| F::EXTERNAL_TEXTURE;
|
||||
| F::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| F::TEXTURE_FORMAT_16BIT_NORM
|
||||
| F::VERTEX_WRITABLE_STORAGE;
|
||||
|
||||
features.set(F::TEXTURE_COMPONENT_SWIZZLE, self.texture_component_swizzle);
|
||||
features.set(F::FLOAT32_FILTERABLE, self.supports_float_filtering);
|
||||
|
||||
@@ -671,35 +671,36 @@ impl PhysicalDeviceFeatures {
|
||||
) -> (wgt::Features, wgt::DownlevelFlags) {
|
||||
use wgt::{DownlevelFlags as Df, Features as F};
|
||||
let mut features = F::empty()
|
||||
| F::MAPPABLE_PRIMARY_BUFFERS
|
||||
| F::IMMEDIATES
|
||||
| F::ADDRESS_MODE_CLAMP_TO_BORDER
|
||||
| F::ADDRESS_MODE_CLAMP_TO_ZERO
|
||||
| F::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| F::CLEAR_TEXTURE
|
||||
| F::IMMEDIATES
|
||||
| F::MAPPABLE_PRIMARY_BUFFERS
|
||||
| F::MEMORY_DECORATION_COHERENT
|
||||
| F::MEMORY_DECORATION_VOLATILE
|
||||
| F::PASSTHROUGH_SHADERS
|
||||
| F::PIPELINE_CACHE
|
||||
| F::SHADER_EARLY_DEPTH_TEST
|
||||
| F::TEXTURE_ATOMIC
|
||||
| F::PASSTHROUGH_SHADERS
|
||||
| F::MEMORY_DECORATION_COHERENT
|
||||
| F::MEMORY_DECORATION_VOLATILE;
|
||||
| F::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES
|
||||
| F::TEXTURE_ATOMIC;
|
||||
|
||||
let mut dl_flags = Df::COMPUTE_SHADERS
|
||||
let mut dl_flags = Df::empty()
|
||||
| Df::BASE_VERTEX
|
||||
| Df::NON_POWER_OF_TWO_MIPMAPPED_TEXTURES
|
||||
| Df::COMPARISON_SAMPLERS
|
||||
| Df::VERTEX_STORAGE
|
||||
| Df::FRAGMENT_STORAGE
|
||||
| Df::DEPTH_TEXTURE_AND_BUFFER_COPIES
|
||||
| Df::BUFFER_BINDINGS_NOT_16_BYTE_ALIGNED
|
||||
| Df::UNRESTRICTED_INDEX_BUFFER
|
||||
| Df::COMPARISON_SAMPLERS
|
||||
| Df::COMPUTE_SHADERS
|
||||
| Df::DEPTH_TEXTURE_AND_BUFFER_COPIES
|
||||
| Df::FRAGMENT_STORAGE
|
||||
| Df::INDIRECT_EXECUTION
|
||||
| Df::VIEW_FORMATS
|
||||
| Df::UNRESTRICTED_EXTERNAL_TEXTURE_COPIES
|
||||
| Df::NONBLOCKING_QUERY_RESOLVE
|
||||
| Df::SHADER_F16_IN_F32
|
||||
| Df::LINEAR_INTERPOLATION
|
||||
| Df::MSL2_1
|
||||
| Df::LINEAR_INTERPOLATION;
|
||||
| Df::NONBLOCKING_QUERY_RESOLVE
|
||||
| Df::NON_POWER_OF_TWO_MIPMAPPED_TEXTURES
|
||||
| Df::SHADER_F16_IN_F32
|
||||
| Df::UNRESTRICTED_EXTERNAL_TEXTURE_COPIES
|
||||
| Df::UNRESTRICTED_INDEX_BUFFER
|
||||
| Df::VERTEX_STORAGE
|
||||
| Df::VIEW_FORMATS;
|
||||
|
||||
// `VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL`
|
||||
// and `VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL`
|
||||
|
||||
+42
-42
@@ -778,13 +778,53 @@ fn map_map_mode(mode: crate::MapMode) -> u32 {
|
||||
|
||||
const FEATURES_MAPPING: [(wgt::Features, webgpu_sys::GpuFeatureName); 16] = [
|
||||
(
|
||||
wgt::Features::DEPTH_CLIP_CONTROL,
|
||||
webgpu_sys::GpuFeatureName::DepthClipControl,
|
||||
wgt::Features::BGRA8UNORM_STORAGE,
|
||||
webgpu_sys::GpuFeatureName::Bgra8unormStorage,
|
||||
),
|
||||
(
|
||||
wgt::Features::CLIP_DISTANCES,
|
||||
webgpu_sys::GpuFeatureName::ClipDistances,
|
||||
),
|
||||
(
|
||||
wgt::Features::DEPTH32FLOAT_STENCIL8,
|
||||
webgpu_sys::GpuFeatureName::Depth32floatStencil8,
|
||||
),
|
||||
(
|
||||
wgt::Features::DEPTH_CLIP_CONTROL,
|
||||
webgpu_sys::GpuFeatureName::DepthClipControl,
|
||||
),
|
||||
(
|
||||
wgt::Features::DUAL_SOURCE_BLENDING,
|
||||
webgpu_sys::GpuFeatureName::DualSourceBlending,
|
||||
),
|
||||
(
|
||||
wgt::Features::FLOAT32_BLENDABLE,
|
||||
webgpu_sys::GpuFeatureName::Float32Blendable,
|
||||
),
|
||||
(
|
||||
wgt::Features::FLOAT32_FILTERABLE,
|
||||
webgpu_sys::GpuFeatureName::Float32Filterable,
|
||||
),
|
||||
(
|
||||
wgt::Features::INDIRECT_FIRST_INSTANCE,
|
||||
webgpu_sys::GpuFeatureName::IndirectFirstInstance,
|
||||
),
|
||||
(
|
||||
wgt::Features::RG11B10UFLOAT_RENDERABLE,
|
||||
webgpu_sys::GpuFeatureName::Rg11b10ufloatRenderable,
|
||||
),
|
||||
(
|
||||
wgt::Features::SHADER_F16,
|
||||
webgpu_sys::GpuFeatureName::ShaderF16,
|
||||
),
|
||||
(
|
||||
wgt::Features::TEXTURE_COMPRESSION_ASTC,
|
||||
webgpu_sys::GpuFeatureName::TextureCompressionAstc,
|
||||
),
|
||||
(
|
||||
wgt::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D,
|
||||
webgpu_sys::GpuFeatureName::TextureCompressionAstcSliced3d,
|
||||
),
|
||||
(
|
||||
wgt::Features::TEXTURE_COMPRESSION_BC,
|
||||
webgpu_sys::GpuFeatureName::TextureCompressionBc,
|
||||
@@ -797,50 +837,10 @@ const FEATURES_MAPPING: [(wgt::Features, webgpu_sys::GpuFeatureName); 16] = [
|
||||
wgt::Features::TEXTURE_COMPRESSION_ETC2,
|
||||
webgpu_sys::GpuFeatureName::TextureCompressionEtc2,
|
||||
),
|
||||
(
|
||||
wgt::Features::TEXTURE_COMPRESSION_ASTC,
|
||||
webgpu_sys::GpuFeatureName::TextureCompressionAstc,
|
||||
),
|
||||
(
|
||||
wgt::Features::TEXTURE_COMPRESSION_ASTC_SLICED_3D,
|
||||
webgpu_sys::GpuFeatureName::TextureCompressionAstcSliced3d,
|
||||
),
|
||||
(
|
||||
wgt::Features::TIMESTAMP_QUERY,
|
||||
webgpu_sys::GpuFeatureName::TimestampQuery,
|
||||
),
|
||||
(
|
||||
wgt::Features::INDIRECT_FIRST_INSTANCE,
|
||||
webgpu_sys::GpuFeatureName::IndirectFirstInstance,
|
||||
),
|
||||
(
|
||||
wgt::Features::SHADER_F16,
|
||||
webgpu_sys::GpuFeatureName::ShaderF16,
|
||||
),
|
||||
(
|
||||
wgt::Features::RG11B10UFLOAT_RENDERABLE,
|
||||
webgpu_sys::GpuFeatureName::Rg11b10ufloatRenderable,
|
||||
),
|
||||
(
|
||||
wgt::Features::BGRA8UNORM_STORAGE,
|
||||
webgpu_sys::GpuFeatureName::Bgra8unormStorage,
|
||||
),
|
||||
(
|
||||
wgt::Features::FLOAT32_FILTERABLE,
|
||||
webgpu_sys::GpuFeatureName::Float32Filterable,
|
||||
),
|
||||
(
|
||||
wgt::Features::FLOAT32_BLENDABLE,
|
||||
webgpu_sys::GpuFeatureName::Float32Blendable,
|
||||
),
|
||||
(
|
||||
wgt::Features::DUAL_SOURCE_BLENDING,
|
||||
webgpu_sys::GpuFeatureName::DualSourceBlending,
|
||||
),
|
||||
(
|
||||
wgt::Features::CLIP_DISTANCES,
|
||||
webgpu_sys::GpuFeatureName::ClipDistances,
|
||||
),
|
||||
];
|
||||
|
||||
fn map_wgt_features(supported_features: webgpu_sys::GpuSupportedFeatures) -> wgt::Features {
|
||||
|
||||
Reference in new issue
Block a user