summaryrefslogtreecommitdiffstats
path: root/wgpu/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wgpu/src/image.rs8
-rw-r--r--wgpu/src/quad.rs1
-rw-r--r--wgpu/src/shader/image.wgsl1
-rw-r--r--wgpu/src/shader/quad.wgsl1
-rw-r--r--wgpu/src/shader/triangle.wgsl1
-rw-r--r--wgpu/src/triangle.rs1
-rw-r--r--wgpu/src/triangle/msaa.rs8
7 files changed, 10 insertions, 11 deletions
diff --git a/wgpu/src/image.rs b/wgpu/src/image.rs
index a59dc04b..0fefbfaf 100644
--- a/wgpu/src/image.rs
+++ b/wgpu/src/image.rs
@@ -74,10 +74,9 @@ impl Pipeline {
wgpu::BindGroupLayoutEntry {
binding: 1,
visibility: wgpu::ShaderStages::FRAGMENT,
- ty: wgpu::BindingType::Sampler {
- comparison: false,
- filtering: true,
- },
+ ty: wgpu::BindingType::Sampler(
+ wgpu::SamplerBindingType::Filtering,
+ ),
count: None,
},
],
@@ -205,6 +204,7 @@ impl Pipeline {
mask: !0,
alpha_to_coverage_enabled: false,
},
+ multiview: None,
});
let vertices =
diff --git a/wgpu/src/quad.rs b/wgpu/src/quad.rs
index 148d0f6a..22f3b815 100644
--- a/wgpu/src/quad.rs
+++ b/wgpu/src/quad.rs
@@ -128,6 +128,7 @@ impl Pipeline {
mask: !0,
alpha_to_coverage_enabled: false,
},
+ multiview: None,
});
let vertices =
diff --git a/wgpu/src/shader/image.wgsl b/wgpu/src/shader/image.wgsl
index a63ee8f6..ff304422 100644
--- a/wgpu/src/shader/image.wgsl
+++ b/wgpu/src/shader/image.wgsl
@@ -1,4 +1,3 @@
-[[block]]
struct Globals {
transform: mat4x4<f32>;
};
diff --git a/wgpu/src/shader/quad.wgsl b/wgpu/src/shader/quad.wgsl
index 80d733ab..73f5d597 100644
--- a/wgpu/src/shader/quad.wgsl
+++ b/wgpu/src/shader/quad.wgsl
@@ -1,4 +1,3 @@
-[[block]]
struct Globals {
transform: mat4x4<f32>;
scale: f32;
diff --git a/wgpu/src/shader/triangle.wgsl b/wgpu/src/shader/triangle.wgsl
index 96eaabcc..61d9c5a4 100644
--- a/wgpu/src/shader/triangle.wgsl
+++ b/wgpu/src/shader/triangle.wgsl
@@ -1,4 +1,3 @@
-[[block]]
struct Globals {
transform: mat4x4<f32>;
};
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 2aaebe58..c702243b 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -190,6 +190,7 @@ impl Pipeline {
mask: !0,
alpha_to_coverage_enabled: false,
},
+ multiview: None,
});
Pipeline {
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index 070d2d93..9fb87544 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -32,10 +32,9 @@ impl Blit {
entries: &[wgpu::BindGroupLayoutEntry {
binding: 0,
visibility: wgpu::ShaderStages::FRAGMENT,
- ty: wgpu::BindingType::Sampler {
- comparison: false,
- filtering: false,
- },
+ ty: wgpu::BindingType::Sampler(
+ wgpu::SamplerBindingType::NonFiltering,
+ ),
count: None,
}],
});
@@ -122,6 +121,7 @@ impl Blit {
mask: !0,
alpha_to_coverage_enabled: false,
},
+ multiview: None,
});
Blit {