Remove block decorations (#2292)

gfx-rs · Dec 15, 2021 · 3960658 · 3960658
1 parent 0e5892f
commit 3960658
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/player/tests/data/zero-init-buffer-for-binding.wgsl b/player/tests/data/zero-init-buffer-for-binding.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct InOutBuffer {
     data: [[stride(4)]] array<u32>;
 };

diff --git a/wgpu-core/Cargo.toml b/wgpu-core/Cargo.toml
@@ -38,7 +38,7 @@ thiserror = "1"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "3867ef4"
+rev = "8ffd6ba"
 #version = "0.7"
 features = ["span", "validate", "wgsl-in"]
 

diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs
@@ -892,11 +892,7 @@ impl Interface {
                 _ => continue,
             };
             let ty = match module.types[var.ty].inner {
-                naga::TypeInner::Struct {
-                    top_level: true,
-                    members: _,
-                    span,
-                } => ResourceType::Buffer {
+                naga::TypeInner::Struct { members: _, span } => ResourceType::Buffer {
                     size: wgt::BufferSize::new(span as u64).unwrap(),
                 },
                 naga::TypeInner::Image {

diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -75,12 +75,12 @@ js-sys = { version = "0.3" }
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "3867ef4"
+rev = "8ffd6ba"
 #version = "0.7"
 
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "3867ef4"
+rev = "8ffd6ba"
 #version = "0.7"
 features = ["wgsl-in"]
 

diff --git a/wgpu-hal/examples/halmark/shader.wgsl b/wgpu-hal/examples/halmark/shader.wgsl
@@ -1,10 +1,8 @@
-[[block]]
 struct Globals {
     mvp: mat4x4<f32>;
     size: vec2<f32>;
 };
 
-[[block]]
 struct Locals {
     position: vec2<f32>;
     velocity: vec2<f32>;

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -136,20 +136,20 @@ env_logger = "0.8"
 
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "3867ef4"
+rev = "8ffd6ba"
 #version = "0.7"
 optional = true
 
 # used to test all the example shaders
 [dev-dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "3867ef4"
+rev = "8ffd6ba"
 #version = "0.7"
 features = ["wgsl-in"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
-rev = "3867ef4"
+rev = "8ffd6ba"
 #version = "0.7"
 features = ["wgsl-out"]
 

diff --git a/wgpu/examples/boids/compute.wgsl b/wgpu/examples/boids/compute.wgsl
@@ -3,7 +3,6 @@ struct Particle {
   vel : vec2<f32>;
 };
 
-[[block]]
 struct SimParams {
   deltaT : f32;
   rule1Distance : f32;
@@ -14,7 +13,6 @@ struct SimParams {
   rule3Scale : f32;
 };
 
-[[block]]
 struct Particles {
   particles : [[stride(16)]] array<Particle>;
 };

diff --git a/wgpu/examples/cube/shader.wgsl b/wgpu/examples/cube/shader.wgsl
@@ -3,7 +3,6 @@ struct VertexOutput {
     [[builtin(position)]] position: vec4<f32>;
 };
 
-[[block]]
 struct Locals {
     transform: mat4x4<f32>;
 };

diff --git a/wgpu/examples/hello-compute/shader.wgsl b/wgpu/examples/hello-compute/shader.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct PrimeIndices {
     data: [[stride(4)]] array<u32>;
 }; // this is used as both input and output for convenience

diff --git a/wgpu/examples/mipmap/draw.wgsl b/wgpu/examples/mipmap/draw.wgsl
@@ -3,7 +3,6 @@ struct VertexOutput {
     [[location(0)]] tex_coords: vec2<f32>;
 };
 
-[[block]]
 struct Locals {
     transform: mat4x4<f32>;
 };

diff --git a/wgpu/examples/shadow/shader.wgsl b/wgpu/examples/shadow/shader.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Globals {
     view_proj: mat4x4<f32>;
     num_lights: vec4<u32>;
@@ -7,7 +6,6 @@ struct Globals {
 [[group(0), binding(0)]]
 var<uniform> u_globals: Globals;
 
-[[block]]
 struct Entity {
     world: mat4x4<f32>;
     color: vec4<f32>;
@@ -49,13 +47,11 @@ struct Light {
     color: vec4<f32>;
 };
 
-[[block]]
 struct Lights {
     data: [[stride(96)]] array<Light>;
 };
 
 // Used when storage types are not supported
-[[block]]
 struct LightsWithoutStorage {
     data: array<Light, 10>;
 };

diff --git a/wgpu/examples/skybox/shader.wgsl b/wgpu/examples/skybox/shader.wgsl
@@ -3,7 +3,6 @@ struct SkyOutput {
     [[location(0)]] uv: vec3<f32>;
 };
 
-[[block]]
 struct Data {
     // from camera to screen
     proj: mat4x4<f32>;

diff --git a/wgpu/examples/water/terrain.wgsl b/wgpu/examples/water/terrain.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
     projection_view: mat4x4<f32>;
     clipping_plane: vec4<f32>;

diff --git a/wgpu/examples/water/water.wgsl b/wgpu/examples/water/water.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Uniforms {
     view: mat4x4<f32>;
     projection: mat4x4<f32>;

diff --git a/wgpu/tests/vertex_indices/draw.vert.wgsl b/wgpu/tests/vertex_indices/draw.vert.wgsl
@@ -1,4 +1,3 @@
-[[block]]
 struct Indices {
     arr: array<u32>;
 }; // this is used as both input and output for convenience