me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reassign attribute locations

Browse source
This commit is contained in:
Jim Eckerlein 2023-09-24 15:12:32 +02:00
parent 3f467d1212
commit bcc55e6036
4 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

20
wgpu/src/quad/gradient.rs
View file

@ -111,25 +111,25 @@ impl Pipeline {
step_mode: wgpu::VertexStepMode::Instance, step_mode: wgpu::VertexStepMode::Instance,
attributes: &wgpu::vertex_attr_array!( attributes: &wgpu::vertex_attr_array!(
// Colors 1-2 // Colors 1-2
1 => Uint32x4, 0 => Uint32x4,
// Colors 3-4 // Colors 3-4
2 => Uint32x4, 1 => Uint32x4,
// Colors 5-6 // Colors 5-6
3 => Uint32x4, 2 => Uint32x4,
// Colors 7-8 // Colors 7-8
4 => Uint32x4, 3 => Uint32x4,
// Offsets 1-8 // Offsets 1-8
5 => Uint32x4, 4 => Uint32x4,
// Direction // Direction
6 => Float32x4, 5 => Float32x4,
// Position & Scale // Position & Scale
7 => Float32x4, 6 => Float32x4,
// Border color // Border color
8 => Float32x4, 7 => Float32x4,
// Border radius // Border radius
9 => Float32x4, 8 => Float32x4,
// Border width // Border width
10 => Float32 9 => Float32
), ),
}], }],
}, },

12
wgpu/src/quad/solid.rs
View file

@ -92,17 +92,17 @@ impl Pipeline {
step_mode: wgpu::VertexStepMode::Instance, step_mode: wgpu::VertexStepMode::Instance,
attributes: &wgpu::vertex_attr_array!( attributes: &wgpu::vertex_attr_array!(
// Color // Color
1 => Float32x4, 0 => Float32x4,
// Position // Position
2 => Float32x2, 1 => Float32x2,
// Size // Size
3 => Float32x2, 2 => Float32x2,
// Border color // Border color
4 => Float32x4, 3 => Float32x4,
// Border radius // Border radius
5 => Float32x4, 4 => Float32x4,
// Border width // Border width
6 => Float32, 5 => Float32,
), ),
}], }],
}, },

20
wgpu/src/shader/quad/gradient.wgsl
View file

@ -1,15 +1,15 @@
struct GradientVertexInput { struct GradientVertexInput {
@builtin(vertex_index) vertex_index: u32, @builtin(vertex_index) vertex_index: u32,
@location(1) @interpolate(flat) colors_1: vec4<u32>, @location(0) @interpolate(flat) colors_1: vec4<u32>,
@location(2) @interpolate(flat) colors_2: vec4<u32>, @location(1) @interpolate(flat) colors_2: vec4<u32>,
@location(3) @interpolate(flat) colors_3: vec4<u32>, @location(2) @interpolate(flat) colors_3: vec4<u32>,
@location(4) @interpolate(flat) colors_4: vec4<u32>, @location(3) @interpolate(flat) colors_4: vec4<u32>,
@location(5) @interpolate(flat) offsets: vec4<u32>, @location(4) @interpolate(flat) offsets: vec4<u32>,
@location(6) direction: vec4<f32>, @location(5) direction: vec4<f32>,
@location(7) position_and_scale: vec4<f32>, @location(6) position_and_scale: vec4<f32>,
@location(8) border_color: vec4<f32>, @location(7) border_color: vec4<f32>,
@location(9) border_radius: vec4<f32>, @location(8) border_radius: vec4<f32>,
@location(10) border_width: f32, @location(9) border_width: f32,
} }
struct GradientVertexOutput { struct GradientVertexOutput {

12
wgpu/src/shader/quad/solid.wgsl
View file

@ -1,11 +1,11 @@
struct SolidVertexInput { struct SolidVertexInput {
@builtin(vertex_index) vertex_index: u32, @builtin(vertex_index) vertex_index: u32,
@location(1) color: vec4<f32>, @location(0) color: vec4<f32>,
@location(2) pos: vec2<f32>, @location(1) pos: vec2<f32>,
@location(3) scale: vec2<f32>, @location(2) scale: vec2<f32>,
@location(4) border_color: vec4<f32>, @location(3) border_color: vec4<f32>,
@location(5) border_radius: vec4<f32>, @location(4) border_radius: vec4<f32>,
@location(6) border_width: f32, @location(5) border_width: f32,
} }
struct SolidVertexOutput { struct SolidVertexOutput {