Update wgpu to 47fd776

kvark · Nov 18, 2021 · 10e8e6b · 10e8e6b
1 parent afd5c28
commit 10e8e6b
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 67 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,7 +60,7 @@ rust-ini = "0.17"
 serde = "1.0"
 serde_derive = "1.0"
 serde_scan = "0.4"
-wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "8f02b73", features = [] }
+wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "47fd776", features = [] }
 # binaries
 env_logger = "0.8"
 getopts = "0.2"
@@ -69,8 +69,8 @@ png = "0.16"
 winit = "0.25"
 
 [dev-dependencies]
-#naga = { git = "https://github.com/gfx-rs/naga", rev = "7613798", features = ["wgsl-in"] }
-naga = { version = "0.6", features = ["wgsl-in"] }
+naga = { git = "https://github.com/gfx-rs/naga", rev = "eda078d", features = ["wgsl-in"] }
+#naga = { version = "0.6", features = ["wgsl-in"] }
 
 [dependencies.profiling]
 version = "1.0.1"
@@ -80,6 +80,7 @@ default-features = false
 #naga = { path = "../naga" }
 
 [patch."https://github.com/gfx-rs/wgpu"]
+#wgpu = { path = "../wgpu/wgpu" }
 #wgpu-hal = { path = "../wgpu/wgpu-hal" }
 #wgpu-core = { path = "../wgpu/wgpu-core" }
 #wgpu-types = { path = "../wgpu/wgpu-types" }
diff --git a/bin/boilerplate.rs b/bin/boilerplate.rs
@@ -79,6 +79,7 @@ impl Harness {
             .run_until(instance.request_adapter(&wgpu::RequestAdapterOptions {
                 power_preference: wgpu::PowerPreference::HighPerformance,
                 compatible_surface: Some(&surface),
+                force_fallback_adapter: false,
             }))
             .expect("Unable to initialize GPU via the selected backend.");
 
@@ -227,10 +228,9 @@ impl Harness {
                         queue.submit(update_command_buffers);
                     }
 
-                    match surface.get_current_frame() {
+                    match surface.get_current_texture() {
                         Ok(frame) => {
                             let view = frame
-                                .output
                                 .texture
                                 .create_view(&wgpu::TextureViewDescriptor::default());
                             let targets = ScreenTargets {
@@ -240,6 +240,7 @@ impl Harness {
                             };
                             let render_command_buffer = app.draw(&device, targets, &spawner);
                             queue.submit(Some(render_command_buffer));
+                            frame.present();
                         }
                         Err(_) => {}
                     };

diff --git a/res/shader/body.inc.wgsl b/res/shader/body.inc.wgsl
@@ -36,7 +36,7 @@ struct DragConstants {
     abs_stop: vec2<f32>;
     coll: vec2<f32>;
     other: vec2<f32>; // X = wheel speed, Y = drag Z
-    _pad: vec2<f32>;
+    padding: vec2<f32>;
 };
 
 struct GlobalConstants {

diff --git a/src/render/collision.rs b/src/render/collision.rs
@@ -247,7 +247,8 @@ impl GpuCollider {
             contents: bytemuck::bytes_of(&globals),
             usage: wgpu::BufferUsages::UNIFORM,
         });
-        let locals_size = mem::size_of::<Locals>().max(wgpu::BIND_BUFFER_ALIGNMENT as usize);
+        //TODO: device.limits().min_uniform_buffer_offset_alignment
+        let locals_size = mem::size_of::<Locals>().max(256);
         let locals_total_size = (settings.max_objects * locals_size) as wgpu::BufferAddress;
         let local_uniforms = device.create_buffer(&wgpu::BufferDescriptor {
             label: Some("Collision Locals"),

diff --git a/src/render/global.rs b/src/render/global.rs
@@ -65,10 +65,7 @@ impl Context {
                 wgpu::BindGroupLayoutEntry {
                     binding: 1,
                     visibility: wgpu::ShaderStages::all(),
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: false,
-                    },
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                     count: None,
                 },
                 // GPU store
@@ -98,10 +95,7 @@ impl Context {
                 wgpu::BindGroupLayoutEntry {
                     binding: 4,
                     visibility: wgpu::ShaderStages::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: true,
-                    },
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Comparison),
                     count: None,
                 },
             ],

diff --git a/src/render/object.rs b/src/render/object.rs
@@ -161,7 +161,7 @@ impl Context {
             primitive: wgpu::PrimitiveState {
                 topology: wgpu::PrimitiveTopology::TriangleList,
                 front_face: wgpu::FrontFace::Ccw,
-                clamp_depth: false,
+                unclipped_depth: false,
                 ..Default::default()
             },
             depth_stencil: Some(wgpu::DepthStencilState {
@@ -261,10 +261,7 @@ impl Context {
                 wgpu::BindGroupLayoutEntry {
                     binding: 2,
                     visibility: wgpu::ShaderStages::VERTEX,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: false,
-                        comparison: false,
-                    },
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::NonFiltering),
                     count: None,
                 },
             ],

diff --git a/src/render/terrain.rs b/src/render/terrain.rs
@@ -645,30 +645,21 @@ impl Context {
                 wgpu::BindGroupLayoutEntry {
                     binding: 7,
                     visibility: wgpu::ShaderStages::all(),
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: false,
-                    },
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                     count: None,
                 },
                 // flood sampler
                 wgpu::BindGroupLayoutEntry {
                     binding: 8,
                     visibility: wgpu::ShaderStages::FRAGMENT | wgpu::ShaderStages::COMPUTE,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: false,
-                    },
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                     count: None,
                 },
                 // table sampler
                 wgpu::BindGroupLayoutEntry {
                     binding: 9,
                     visibility: wgpu::ShaderStages::FRAGMENT,
-                    ty: wgpu::BindingType::Sampler {
-                        filtering: true,
-                        comparison: false,
-                    },
+                    ty: wgpu::BindingType::Sampler(wgpu::SamplerBindingType::Filtering),
                     count: None,
                 },
             ],