mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 23:41:01 +01:00
[naga] Update naga with new struct members separator
This commit is contained in:
1 parent
ba07db90c8
commit
c5d5dbc7eb
15 files changed
+68
-68
No files matched your search
+2
-2
@@ -90,14 +90,14 @@ js-sys = { version = "0.3" }
|
||||
|
||||
[dependencies.naga]
|
||||
git = "https://github.com/gfx-rs/naga"
|
||||
rev = "a45b9a6"
|
||||
rev = "f90e563"
|
||||
#version = "0.8"
|
||||
|
||||
# DEV dependencies
|
||||
|
||||
[dev-dependencies.naga]
|
||||
git = "https://github.com/gfx-rs/naga"
|
||||
rev = "a45b9a6"
|
||||
rev = "f90e563"
|
||||
#version = "0.8"
|
||||
features = ["wgsl-in"]
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
struct Globals {
|
||||
mvp: mat4x4<f32>;
|
||||
size: vec2<f32>;
|
||||
mvp: mat4x4<f32>,
|
||||
size: vec2<f32>,
|
||||
};
|
||||
|
||||
struct Locals {
|
||||
position: vec2<f32>;
|
||||
velocity: vec2<f32>;
|
||||
color: u32;
|
||||
position: vec2<f32>,
|
||||
velocity: vec2<f32>,
|
||||
color: u32,
|
||||
};
|
||||
|
||||
@group(0)
|
||||
@@ -18,9 +18,9 @@ var<uniform> globals: Globals;
|
||||
var<uniform> locals: Locals;
|
||||
|
||||
struct VertexOutput {
|
||||
@builtin(position) position: vec4<f32>;
|
||||
@location(0) tex_coords: vec2<f32>;
|
||||
@location(1) color: vec4<f32>;
|
||||
@builtin(position) position: vec4<f32>,
|
||||
@location(0) tex_coords: vec2<f32>,
|
||||
@location(1) color: vec4<f32>,
|
||||
};
|
||||
|
||||
@stage(vertex)
|
||||
|
||||
Reference in new issue
Block a user