mirror of
https://github.com/gfx-rs/wgpu.git
synced 2024-11-25 16:24:24 +00:00
Convert All Default Implementations on Enums to derive(Default)
This commit is contained in:
char0313
Connor Fitzgerald
parent
29643139e1
commit
ac5390528e
@ -145,6 +145,7 @@ both `raw_window_handle::HasRawWindowHandle` and `raw_window_handle::HasRawDispl
|
||||
|
||||
#### General
|
||||
|
||||
- Convert all Default Implementations on Enums to derive(Default)
|
||||
- Changed wgpu-hal and wgpu-core implementation to pass RawDisplayHandle and RawWindowHandle as separate
|
||||
parameters instead of passing an impl trait over both HasRawDisplayHandle and HasRawWindowHandle. By @i509VCB in [#3022](https://github.com/gfx-rs/wgpu/pull/3022)
|
||||
- Changed `Instance::as_hal<A>` to just return an `Option<&A::Instance>` rather than taking a callback. By @jimb in [#2991](https://github.com/gfx-rs/wgpu/pull/2991)
|
||||
|
||||
@ -70,23 +70,18 @@ pub enum Backend {
|
||||
/// Corresponds to [WebGPU `GPUPowerPreference`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpupowerpreference).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
|
||||
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum PowerPreference {
|
||||
/// Adapter that uses the least possible power. This is often an integrated GPU.
|
||||
#[default]
|
||||
LowPower = 0,
|
||||
/// Adapter that has the highest performance. This is often a discrete GPU.
|
||||
HighPerformance = 1,
|
||||
}
|
||||
|
||||
impl Default for PowerPreference {
|
||||
fn default() -> Self {
|
||||
Self::LowPower
|
||||
}
|
||||
}
|
||||
|
||||
bitflags::bitflags! {
|
||||
/// Represents the backends that wgpu will use.
|
||||
#[repr(transparent)]
|
||||
@ -1223,7 +1218,7 @@ bitflags_serde_shim::impl_serde_for_bitflags!(ShaderStages);
|
||||
/// Corresponds to [WebGPU `GPUTextureViewDimension`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gputextureviewdimension).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
pub enum TextureViewDimension {
|
||||
@ -1232,6 +1227,7 @@ pub enum TextureViewDimension {
|
||||
D1,
|
||||
/// A two dimensional texture. `texture_2d` in WGSL and `texture2D` in GLSL.
|
||||
#[cfg_attr(feature = "serde", serde(rename = "2d"))]
|
||||
#[default]
|
||||
D2,
|
||||
/// A two dimensional array texture. `texture_2d_array` in WGSL and `texture2DArray` in GLSL.
|
||||
#[cfg_attr(feature = "serde", serde(rename = "2d-array"))]
|
||||
@ -1247,12 +1243,6 @@ pub enum TextureViewDimension {
|
||||
D3,
|
||||
}
|
||||
|
||||
impl Default for TextureViewDimension {
|
||||
fn default() -> Self {
|
||||
Self::D2
|
||||
}
|
||||
}
|
||||
|
||||
impl TextureViewDimension {
|
||||
/// Get the texture dimension required of this texture view dimension.
|
||||
pub fn compatible_texture_dimension(self) -> TextureDimension {
|
||||
@ -1311,12 +1301,13 @@ pub enum BlendFactor {
|
||||
/// Corresponds to [WebGPU `GPUBlendOperation`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpublendoperation).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum BlendOperation {
|
||||
/// Src + Dst
|
||||
#[default]
|
||||
Add = 0,
|
||||
/// Src - Dst
|
||||
Subtract = 1,
|
||||
@ -1328,12 +1319,6 @@ pub enum BlendOperation {
|
||||
Max = 4,
|
||||
}
|
||||
|
||||
impl Default for BlendOperation {
|
||||
fn default() -> Self {
|
||||
Self::Add
|
||||
}
|
||||
}
|
||||
|
||||
/// Describes a blend component of a [`BlendState`].
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUBlendComponent`](
|
||||
@ -1468,7 +1453,7 @@ impl From<TextureFormat> for ColorTargetState {
|
||||
/// Corresponds to [WebGPU `GPUPrimitiveTopology`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpuprimitivetopology).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
@ -1486,6 +1471,7 @@ pub enum PrimitiveTopology {
|
||||
/// Vertex data is a list of triangles. Each set of 3 vertices composes a new triangle.
|
||||
///
|
||||
/// Vertices `0 1 2 3 4 5` create two triangles `0 1 2` and `3 4 5`
|
||||
#[default]
|
||||
TriangleList = 3,
|
||||
/// Vertex data is a triangle strip. Each set of three adjacent vertices form a triangle.
|
||||
///
|
||||
@ -1493,12 +1479,6 @@ pub enum PrimitiveTopology {
|
||||
TriangleStrip = 4,
|
||||
}
|
||||
|
||||
impl Default for PrimitiveTopology {
|
||||
fn default() -> Self {
|
||||
PrimitiveTopology::TriangleList
|
||||
}
|
||||
}
|
||||
|
||||
impl PrimitiveTopology {
|
||||
/// Returns true for strip topologies.
|
||||
pub fn is_strip(&self) -> bool {
|
||||
@ -1514,7 +1494,7 @@ impl PrimitiveTopology {
|
||||
/// Corresponds to [WebGPU `GPUFrontFace`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpufrontface).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
|
||||
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
@ -1522,6 +1502,7 @@ pub enum FrontFace {
|
||||
/// Triangles with vertices in counter clockwise order are considered the front face.
|
||||
///
|
||||
/// This is the default with right handed coordinate spaces.
|
||||
#[default]
|
||||
Ccw = 0,
|
||||
/// Triangles with vertices in clockwise order are considered the front face.
|
||||
///
|
||||
@ -1529,12 +1510,6 @@ pub enum FrontFace {
|
||||
Cw = 1,
|
||||
}
|
||||
|
||||
impl Default for FrontFace {
|
||||
fn default() -> Self {
|
||||
Self::Ccw
|
||||
}
|
||||
}
|
||||
|
||||
/// Face of a vertex.
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUCullMode`](
|
||||
@ -1554,12 +1529,13 @@ pub enum Face {
|
||||
|
||||
/// Type of drawing mode for polygons
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
|
||||
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum PolygonMode {
|
||||
/// Polygons are filled
|
||||
#[default]
|
||||
Fill = 0,
|
||||
/// Polygons are drawn as line segments
|
||||
Line = 1,
|
||||
@ -1567,12 +1543,6 @@ pub enum PolygonMode {
|
||||
Point = 2,
|
||||
}
|
||||
|
||||
impl Default for PolygonMode {
|
||||
fn default() -> Self {
|
||||
Self::Fill
|
||||
}
|
||||
}
|
||||
|
||||
/// Describes the state of primitive assembly and rasterization in a render pipeline.
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUPrimitiveState`](
|
||||
@ -3254,33 +3224,29 @@ impl DepthStencilState {
|
||||
/// Corresponds to [WebGPU `GPUIndexFormat`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpuindexformat).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum IndexFormat {
|
||||
/// Indices are 16 bit unsigned integers.
|
||||
Uint16 = 0,
|
||||
/// Indices are 32 bit unsigned integers.
|
||||
#[default]
|
||||
Uint32 = 1,
|
||||
}
|
||||
|
||||
impl Default for IndexFormat {
|
||||
fn default() -> Self {
|
||||
Self::Uint32
|
||||
}
|
||||
}
|
||||
|
||||
/// Operation to perform on the stencil value.
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUStencilOperation`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpustenciloperation).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum StencilOperation {
|
||||
/// Keep stencil value unchanged.
|
||||
#[default]
|
||||
Keep = 0,
|
||||
/// Set stencil value to zero.
|
||||
Zero = 1,
|
||||
@ -3301,12 +3267,6 @@ pub enum StencilOperation {
|
||||
DecrementWrap = 7,
|
||||
}
|
||||
|
||||
impl Default for StencilOperation {
|
||||
fn default() -> Self {
|
||||
Self::Keep
|
||||
}
|
||||
}
|
||||
|
||||
/// Describes stencil state in a render pipeline.
|
||||
///
|
||||
/// If you are not using stencil state, set this to [`StencilFaceState::IGNORE`].
|
||||
@ -3453,23 +3413,18 @@ impl CompareFunction {
|
||||
/// [`Vertex`]: VertexStepMode::Vertex
|
||||
/// [`Instance`]: VertexStepMode::Instance
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum VertexStepMode {
|
||||
/// Vertex data is advanced every vertex.
|
||||
#[default]
|
||||
Vertex = 0,
|
||||
/// Vertex data is advanced every instance.
|
||||
Instance = 1,
|
||||
}
|
||||
|
||||
impl Default for VertexStepMode {
|
||||
fn default() -> Self {
|
||||
VertexStepMode::Vertex
|
||||
}
|
||||
}
|
||||
|
||||
/// Vertex inputs (attributes) to shaders.
|
||||
///
|
||||
/// Arrays of these can be made with the [`vertex_attr_array`]
|
||||
@ -3717,7 +3672,7 @@ impl<T> Default for CommandEncoderDescriptor<Option<T>> {
|
||||
|
||||
/// Behavior of the presentation engine based on frame rate.
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
|
||||
#[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
pub enum PresentMode {
|
||||
@ -3743,6 +3698,7 @@ pub enum PresentMode {
|
||||
/// Supported on all platforms.
|
||||
///
|
||||
/// If you don't know what mode to choose, choose this mode. This is traditionally called "Vsync On".
|
||||
#[default]
|
||||
Fifo = 2,
|
||||
/// Presentation frames are kept in a First-In-First-Out queue approximately 3 frames
|
||||
/// long. Every vertical blanking period, the presentation engine will pop a frame
|
||||
@ -3786,12 +3742,6 @@ pub enum PresentMode {
|
||||
Mailbox = 5,
|
||||
}
|
||||
|
||||
impl Default for PresentMode {
|
||||
fn default() -> Self {
|
||||
Self::Fifo
|
||||
}
|
||||
}
|
||||
|
||||
/// Specifies how the alpha channel of the textures should be handled during (martin mouv i step)
|
||||
/// compositing.
|
||||
#[repr(C)]
|
||||
@ -4293,12 +4243,13 @@ impl<L> TextureDescriptor<L> {
|
||||
/// Corresponds to [WebGPU `GPUTextureAspect`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gputextureaspect).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
pub enum TextureAspect {
|
||||
/// Depth, Stencil, and Color.
|
||||
#[default]
|
||||
All,
|
||||
/// Stencil.
|
||||
StencilOnly,
|
||||
@ -4306,18 +4257,12 @@ pub enum TextureAspect {
|
||||
DepthOnly,
|
||||
}
|
||||
|
||||
impl Default for TextureAspect {
|
||||
fn default() -> Self {
|
||||
Self::All
|
||||
}
|
||||
}
|
||||
|
||||
/// How edges should be handled in texture addressing.
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUAddressMode`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpuaddressmode).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
@ -4326,6 +4271,7 @@ pub enum AddressMode {
|
||||
///
|
||||
/// -0.25 -> 0.0
|
||||
/// 1.25 -> 1.0
|
||||
#[default]
|
||||
ClampToEdge = 0,
|
||||
/// Repeat the texture in a tiling fashion
|
||||
///
|
||||
@ -4345,18 +4291,12 @@ pub enum AddressMode {
|
||||
ClampToBorder = 3,
|
||||
}
|
||||
|
||||
impl Default for AddressMode {
|
||||
fn default() -> Self {
|
||||
Self::ClampToEdge
|
||||
}
|
||||
}
|
||||
|
||||
/// Texel mixing mode when sampling between texels.
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUFilterMode`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpufiltermode).
|
||||
#[repr(C)]
|
||||
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
|
||||
#[derive(Copy, Clone, Debug, Default, Hash, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
#[cfg_attr(feature = "serde", serde(rename_all = "kebab-case"))]
|
||||
@ -4364,6 +4304,7 @@ pub enum FilterMode {
|
||||
/// Nearest neighbor sampling.
|
||||
///
|
||||
/// This creates a pixelated effect when used as a mag filter
|
||||
#[default]
|
||||
Nearest = 0,
|
||||
/// Linear Interpolation
|
||||
///
|
||||
@ -4371,12 +4312,6 @@ pub enum FilterMode {
|
||||
Linear = 1,
|
||||
}
|
||||
|
||||
impl Default for FilterMode {
|
||||
fn default() -> Self {
|
||||
Self::Nearest
|
||||
}
|
||||
}
|
||||
|
||||
/// A range of push constant memory to pass to a shader stage.
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
@ -4512,7 +4447,7 @@ pub struct ImageDataLayout {
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUBufferBindingType`](
|
||||
/// https://gpuweb.github.io/gpuweb/#enumdef-gpubufferbindingtype).
|
||||
#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
|
||||
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq, Hash)]
|
||||
#[cfg_attr(feature = "trace", derive(Serialize))]
|
||||
#[cfg_attr(feature = "replay", derive(Deserialize))]
|
||||
pub enum BufferBindingType {
|
||||
@ -4536,6 +4471,7 @@ pub enum BufferBindingType {
|
||||
/// vec2 anotherUniform;
|
||||
/// };
|
||||
/// ```
|
||||
#[default]
|
||||
Uniform,
|
||||
/// A storage buffer.
|
||||
///
|
||||
@ -4573,12 +4509,6 @@ pub enum BufferBindingType {
|
||||
},
|
||||
}
|
||||
|
||||
impl Default for BufferBindingType {
|
||||
fn default() -> Self {
|
||||
Self::Uniform
|
||||
}
|
||||
}
|
||||
|
||||
/// Specific type of a sample in a texture binding.
|
||||
///
|
||||
/// Corresponds to [WebGPU `GPUTextureSampleType`](
|
||||
|
||||
Loading…
Reference in New Issue
Block a user