archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge #1235

Browse Source 
1235: Update VertexFormat variants r=grovesNL a=kvark

**Connections**
Matches https://github.com/gpuweb/gpuweb/pull/1322 and https://github.com/gpuweb/gpuweb/pull/1469

**Description**
Just updates us to recent upstream API.
Also breaks lots of user code!

**Testing**
Not functional


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
bors[bot] 2021-02-27 16:05:04 +00:00 committed by GitHub
commit c3a18c3d8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 130 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
wgpu-core/src/conv.rs
View File

@ -456,40 +456,40 @@ pub fn map_vertex_format(vertex_format: wgt::VertexFormat) -> hal::format::Forma
use hal::format::Format as H;
use wgt::VertexFormat as Vf;
match vertex_format {
Vf::Uchar2 => H::Rg8Uint,
Vf::Uchar4 => H::Rgba8Uint,
Vf::Char2 => H::Rg8Sint,
Vf::Char4 => H::Rgba8Sint,
Vf::Uchar2Norm => H::Rg8Unorm,
Vf::Uchar4Norm => H::Rgba8Unorm,
Vf::Char2Norm => H::Rg8Snorm,
Vf::Char4Norm => H::Rgba8Snorm,
Vf::Ushort2 => H::Rg16Uint,
Vf::Ushort4 => H::Rgba16Uint,
Vf::Short2 => H::Rg16Sint,
Vf::Short4 => H::Rgba16Sint,
Vf::Ushort2Norm => H::Rg16Unorm,
Vf::Ushort4Norm => H::Rgba16Unorm,
Vf::Short2Norm => H::Rg16Snorm,
Vf::Short4Norm => H::Rgba16Snorm,
Vf::Half2 => H::Rg16Sfloat,
Vf::Half4 => H::Rgba16Sfloat,
Vf::Float => H::R32Sfloat,
Vf::Float2 => H::Rg32Sfloat,
Vf::Float3 => H::Rgb32Sfloat,
Vf::Float4 => H::Rgba32Sfloat,
Vf::Uint => H::R32Uint,
Vf::Uint2 => H::Rg32Uint,
Vf::Uint3 => H::Rgb32Uint,
Vf::Uint4 => H::Rgba32Uint,
Vf::Int => H::R32Sint,
Vf::Int2 => H::Rg32Sint,
Vf::Int3 => H::Rgb32Sint,
Vf::Int4 => H::Rgba32Sint,
Vf::Double => H::R64Sfloat,
Vf::Double2 => H::Rg64Sfloat,
Vf::Double3 => H::Rgb64Sfloat,
Vf::Double4 => H::Rgba64Sfloat,
Vf::Uint8x2 => H::Rg8Uint,
Vf::Uint8x4 => H::Rgba8Uint,
Vf::Sint8x2 => H::Rg8Sint,
Vf::Sint8x4 => H::Rgba8Sint,
Vf::Unorm8x2 => H::Rg8Unorm,
Vf::Unorm8x4 => H::Rgba8Unorm,
Vf::Snorm8x2 => H::Rg8Snorm,
Vf::Snorm8x4 => H::Rgba8Snorm,
Vf::Uint16x2 => H::Rg16Uint,
Vf::Uint16x4 => H::Rgba16Uint,
Vf::Sint16x2 => H::Rg16Sint,
Vf::Sint16x4 => H::Rgba16Sint,
Vf::Unorm16x2 => H::Rg16Unorm,
Vf::Unorm16x4 => H::Rgba16Unorm,
Vf::Snorm16x2 => H::Rg16Snorm,
Vf::Snorm16x4 => H::Rgba16Snorm,
Vf::Float16x2 => H::Rg16Sfloat,
Vf::Float16x4 => H::Rgba16Sfloat,
Vf::Float32 => H::R32Sfloat,
Vf::Float32x2 => H::Rg32Sfloat,
Vf::Float32x3 => H::Rgb32Sfloat,
Vf::Float32x4 => H::Rgba32Sfloat,
Vf::Uint32 => H::R32Uint,
Vf::Uint32x2 => H::Rg32Uint,
Vf::Uint32x3 => H::Rgb32Uint,
Vf::Uint32x4 => H::Rgba32Uint,
Vf::Sint32 => H::R32Sint,
Vf::Sint32x2 => H::Rg32Sint,
Vf::Sint32x3 => H::Rgb32Sint,
Vf::Sint32x4 => H::Rgba32Sint,
Vf::Float64 => H::R64Sfloat,
Vf::Float64x2 => H::Rg64Sfloat,
Vf::Float64x3 => H::Rgb64Sfloat,
Vf::Float64x4 => H::Rgba64Sfloat,
}
}

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

@ -2054,10 +2054,10 @@ impl<B: GfxBackend> Device<B> {
);
}
if let wgt::VertexFormat::Double
| wgt::VertexFormat::Double2
| wgt::VertexFormat::Double3
| wgt::VertexFormat::Double4 = attribute.format
if let wgt::VertexFormat::Float64
| wgt::VertexFormat::Float64x2
| wgt::VertexFormat::Float64x3
| wgt::VertexFormat::Float64x4 = attribute.format
{
if !self
.features

56
wgpu-core/src/validation.rs
View File

@ -521,32 +521,40 @@ impl NumericType {
use wgt::VertexFormat as Vf;
let (dim, kind, width) = match format {
Vf::Uchar2 | Vf::Ushort2 => (NumericDimension::Vector(Vs::Bi), Sk::Uint, 4),
Vf::Uchar4 | Vf::Ushort4 => (NumericDimension::Vector(Vs::Quad), Sk::Uint, 4),
Vf::Char2 | Vf::Short2 => (NumericDimension::Vector(Vs::Bi), Sk::Sint, 4),
Vf::Char4 | Vf::Short4 => (NumericDimension::Vector(Vs::Quad), Sk::Sint, 4),
Vf::Uchar2Norm | Vf::Char2Norm | Vf::Ushort2Norm | Vf::Short2Norm | Vf::Half2 => {
(NumericDimension::Vector(Vs::Bi), Sk::Float, 4)
Vf::Uint32 => (NumericDimension::Scalar, Sk::Uint, 4),
Vf::Uint8x2 | Vf::Uint16x2 | Vf::Uint32x2 => {
(NumericDimension::Vector(Vs::Bi), Sk::Uint, 4)
}
Vf::Uchar4Norm | Vf::Char4Norm | Vf::Ushort4Norm | Vf::Short4Norm | Vf::Half4 => {
(NumericDimension::Vector(Vs::Quad), Sk::Float, 4)
Vf::Uint32x3 => (NumericDimension::Vector(Vs::Tri), Sk::Uint, 4),
Vf::Uint8x4 | Vf::Uint16x4 | Vf::Uint32x4 => {
(NumericDimension::Vector(Vs::Quad), Sk::Uint, 4)
}
Vf::Float => (NumericDimension::Scalar, Sk::Float, 4),
Vf::Float2 => (NumericDimension::Vector(Vs::Bi), Sk::Float, 4),
Vf::Float3 => (NumericDimension::Vector(Vs::Tri), Sk::Float, 4),
Vf::Float4 => (NumericDimension::Vector(Vs::Quad), Sk::Float, 4),
Vf::Uint => (NumericDimension::Scalar, Sk::Uint, 4),
Vf::Uint2 => (NumericDimension::Vector(Vs::Bi), Sk::Uint, 4),
Vf::Uint3 => (NumericDimension::Vector(Vs::Tri), Sk::Uint, 4),
Vf::Uint4 => (NumericDimension::Vector(Vs::Quad), Sk::Uint, 4),
Vf::Int => (NumericDimension::Scalar, Sk::Sint, 4),
Vf::Int2 => (NumericDimension::Vector(Vs::Bi), Sk::Sint, 4),
Vf::Int3 => (NumericDimension::Vector(Vs::Tri), Sk::Sint, 4),
Vf::Int4 => (NumericDimension::Vector(Vs::Quad), Sk::Sint, 4),
Vf::Double => (NumericDimension::Scalar, Sk::Float, 8),
Vf::Double2 => (NumericDimension::Vector(Vs::Bi), Sk::Float, 8),
Vf::Double3 => (NumericDimension::Vector(Vs::Tri), Sk::Float, 8),
Vf::Double4 => (NumericDimension::Vector(Vs::Quad), Sk::Float, 8),
Vf::Sint32 => (NumericDimension::Scalar, Sk::Sint, 4),
Vf::Sint8x2 | Vf::Sint16x2 | Vf::Sint32x2 => {
(NumericDimension::Vector(Vs::Bi), Sk::Sint, 4)
}
Vf::Sint32x3 => (NumericDimension::Vector(Vs::Tri), Sk::Sint, 4),
Vf::Sint8x4 | Vf::Sint16x4 | Vf::Sint32x4 => {
(NumericDimension::Vector(Vs::Quad), Sk::Sint, 4)
}
Vf::Float32 => (NumericDimension::Scalar, Sk::Float, 4),
Vf::Unorm8x2
| Vf::Snorm8x2
| Vf::Unorm16x2
| Vf::Snorm16x2
| Vf::Float16x2
| Vf::Float32x2 => (NumericDimension::Vector(Vs::Bi), Sk::Float, 4),
Vf::Float32x3 => (NumericDimension::Vector(Vs::Tri), Sk::Float, 4),
Vf::Unorm8x4
| Vf::Snorm8x4
| Vf::Unorm16x4
| Vf::Snorm16x4
| Vf::Float16x4
| Vf::Float32x4 => (NumericDimension::Vector(Vs::Quad), Sk::Float, 4),
Vf::Float64 => (NumericDimension::Scalar, Sk::Float, 8),
Vf::Float64x2 => (NumericDimension::Vector(Vs::Bi), Sk::Float, 8),
Vf::Float64x3 => (NumericDimension::Vector(Vs::Tri), Sk::Float, 8),
Vf::Float64x4 => (NumericDimension::Vector(Vs::Quad), Sk::Float, 8),
};
NumericType {

120
wgpu-types/src/lib.rs
View File

@ -1776,105 +1776,105 @@ pub struct VertexAttribute {
#[cfg_attr(feature = "replay", derive(Deserialize))]
pub enum VertexFormat {
/// Two unsigned bytes (u8). `uvec2` in shaders.
Uchar2 = 0,
Uint8x2 = 0,
/// Four unsigned bytes (u8). `uvec4` in shaders.
Uchar4 = 1,
Uint8x4 = 1,
/// Two signed bytes (i8). `ivec2` in shaders.
Char2 = 2,
Sint8x2 = 2,
/// Four signed bytes (i8). `ivec4` in shaders.
Char4 = 3,
Sint8x4 = 3,
/// Two unsigned bytes (u8). [0, 255] converted to float [0, 1] `vec2` in shaders.
Uchar2Norm = 4,
Unorm8x2 = 4,
/// Four unsigned bytes (u8). [0, 255] converted to float [0, 1] `vec4` in shaders.
Uchar4Norm = 5,
Unorm8x4 = 5,
/// Two signed bytes (i8). [-127, 127] converted to float [-1, 1] `vec2` in shaders.
Char2Norm = 6,
Snorm8x2 = 6,
/// Four signed bytes (i8). [-127, 127] converted to float [-1, 1] `vec4` in shaders.
Char4Norm = 7,
Snorm8x4 = 7,
/// Two unsigned shorts (u16). `uvec2` in shaders.
Ushort2 = 8,
Uint16x2 = 8,
/// Four unsigned shorts (u16). `uvec4` in shaders.
Ushort4 = 9,
Uint16x4 = 9,
/// Two signed shorts (i16). `ivec2` in shaders.
Short2 = 10,
Sint16x2 = 10,
/// Four signed shorts (i16). `ivec4` in shaders.
Short4 = 11,
Sint16x4 = 11,
/// Two unsigned shorts (u16). [0, 65535] converted to float [0, 1] `vec2` in shaders.
Ushort2Norm = 12,
Unorm16x2 = 12,
/// Four unsigned shorts (u16). [0, 65535] converted to float [0, 1] `vec4` in shaders.
Ushort4Norm = 13,
Unorm16x4 = 13,
/// Two signed shorts (i16). [-32767, 32767] converted to float [-1, 1] `vec2` in shaders.
Short2Norm = 14,
Snorm16x2 = 14,
/// Four signed shorts (i16). [-32767, 32767] converted to float [-1, 1] `vec4` in shaders.
Short4Norm = 15,
Snorm16x4 = 15,
/// Two half-precision floats (no Rust equiv). `vec2` in shaders.
Half2 = 16,
Float16x2 = 16,
/// Four half-precision floats (no Rust equiv). `vec4` in shaders.
Half4 = 17,
Float16x4 = 17,
/// One single-precision float (f32). `float` in shaders.
Float = 18,
Float32 = 18,
/// Two single-precision floats (f32). `vec2` in shaders.
Float2 = 19,
Float32x2 = 19,
/// Three single-precision floats (f32). `vec3` in shaders.
Float3 = 20,
Float32x3 = 20,
/// Four single-precision floats (f32). `vec4` in shaders.
Float4 = 21,
Float32x4 = 21,
/// One unsigned int (u32). `uint` in shaders.
Uint = 22,
Uint32 = 22,
/// Two unsigned ints (u32). `uvec2` in shaders.
Uint2 = 23,
Uint32x2 = 23,
/// Three unsigned ints (u32). `uvec3` in shaders.
Uint3 = 24,
Uint32x3 = 24,
/// Four unsigned ints (u32). `uvec4` in shaders.
Uint4 = 25,
Uint32x4 = 25,
/// One signed int (i32). `int` in shaders.
Int = 26,
Sint32 = 26,
/// Two signed ints (i32). `ivec2` in shaders.
Int2 = 27,
Sint32x2 = 27,
/// Three signed ints (i32). `ivec3` in shaders.
Int3 = 28,
Sint32x3 = 28,
/// Four signed ints (i32). `ivec4` in shaders.
Int4 = 29,
Sint32x4 = 29,
/// One double-precision float (f64). `double` in shaders. Requires VERTEX_ATTRIBUTE_64BIT features.
Double = 30,
Float64 = 30,
/// Two double-precision floats (f64). `dvec2` in shaders. Requires VERTEX_ATTRIBUTE_64BIT features.
Double2 = 31,
Float64x2 = 31,
/// Three double-precision floats (f64). `dvec3` in shaders. Requires VERTEX_ATTRIBUTE_64BIT features.
Double3 = 32,
Float64x3 = 32,
/// Four double-precision floats (f64). `dvec4` in shaders. Requires VERTEX_ATTRIBUTE_64BIT features.
Double4 = 33,
Float64x4 = 33,
}
impl VertexFormat {
/// Returns the byte size of the format.
pub const fn size(&self) -> u64 {
match self {
Self::Uchar2 | Self::Char2 | Self::Uchar2Norm | Self::Char2Norm => 2,
Self::Uchar4
| Self::Char4
| Self::Uchar4Norm
| Self::Char4Norm
| Self::Ushort2
| Self::Short2
| Self::Ushort2Norm
| Self::Short2Norm
| Self::Half2
| Self::Float
| Self::Uint
| Self::Int => 4,
Self::Ushort4
| Self::Short4
| Self::Ushort4Norm
| Self::Short4Norm
| Self::Half4
| Self::Float2
| Self::Uint2
| Self::Int2
| Self::Double => 8,
Self::Float3 | Self::Uint3 | Self::Int3 => 12,
Self::Float4 | Self::Uint4 | Self::Int4 | Self::Double2 => 16,
Self::Double3 => 24,
Self::Double4 => 32,
Self::Uint8x2 | Self::Sint8x2 | Self::Unorm8x2 | Self::Snorm8x2 => 2,
Self::Uint8x4
| Self::Sint8x4
| Self::Unorm8x4
| Self::Snorm8x4
| Self::Uint16x2
| Self::Sint16x2
| Self::Unorm16x2
| Self::Snorm16x2
| Self::Float16x2
| Self::Float32
| Self::Uint32
| Self::Sint32 => 4,
Self::Uint16x4
| Self::Sint16x4
| Self::Unorm16x4
| Self::Snorm16x4
| Self::Float16x4
| Self::Float32x2
| Self::Uint32x2
| Self::Sint32x2
| Self::Float64 => 8,
Self::Float32x3 | Self::Uint32x3 | Self::Sint32x3 => 12,
Self::Float32x4 | Self::Uint32x4 | Self::Sint32x4 | Self::Float64x2 => 16,
Self::Float64x3 => 24,
Self::Float64x4 => 32,
}
}
}