Skip to content

Commit a5e69cf

Browse files
committed
Update wgpu to 22.0
1 parent aed9a03 commit a5e69cf

File tree

12 files changed

+16
-2
lines changed

12 files changed

+16
-2
lines changed

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ cosmic-text = "0.12"
148148
dark-light = "1.0"
149149
futures = "0.3"
150150
glam = "0.25"
151-
glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "ce412b3954118d2a4ae20de2d6959247d6f7ed76" }
151+
glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "0d7ba1bba4dd71eb88d2cface5ce649db2413cb7" }
152152
guillotiere = "0.6"
153153
half = "2.2"
154154
image = { version = "0.24", default-features = false }
@@ -181,7 +181,7 @@ wasm-bindgen-futures = "0.4"
181181
wasm-timer = "0.2"
182182
web-sys = "0.3.69"
183183
web-time = "1.1"
184-
wgpu = "0.20.1"
184+
wgpu = "22.0"
185185
winapi = "0.3"
186186
window_clipboard = "0.4.1"
187187
winit = { git = "https://github.com/iced-rs/winit.git", rev = "254d6b3420ce4e674f516f7a2bd440665e05484d" }

benches/wgpu.rs

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ fn benchmark<'a>(
6666
label: None,
6767
required_features: wgpu::Features::empty(),
6868
required_limits: wgpu::Limits::default(),
69+
memory_hints: wgpu::MemoryHints::MemoryUsage,
6970
},
7071
None,
7172
))

examples/custom_shader/src/scene/pipeline.rs

+2
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ impl Pipeline {
282282
wgpu::PipelineCompilationOptions::default(),
283283
}),
284284
multiview: None,
285+
cache: None,
285286
});
286287

287288
let depth_pipeline = DepthPipeline::new(
@@ -518,6 +519,7 @@ impl DepthPipeline {
518519
wgpu::PipelineCompilationOptions::default(),
519520
}),
520521
multiview: None,
522+
cache: None,
521523
});
522524

523525
Self {

examples/integration/src/main.rs

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
102102
required_features: adapter_features
103103
& wgpu::Features::default(),
104104
required_limits: wgpu::Limits::default(),
105+
memory_hints:
106+
wgpu::MemoryHints::MemoryUsage,
105107
},
106108
None,
107109
)

examples/integration/src/scene.rs

+1
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,6 @@ fn build_pipeline(
101101
alpha_to_coverage_enabled: false,
102102
},
103103
multiview: None,
104+
cache: None,
104105
})
105106
}

wgpu/src/color.rs

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ pub fn convert(
143143
depth_stencil: None,
144144
multisample: wgpu::MultisampleState::default(),
145145
multiview: None,
146+
cache: None,
146147
});
147148

148149
let texture = device.create_texture(&wgpu::TextureDescriptor {

wgpu/src/image/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ impl Pipeline {
190190
alpha_to_coverage_enabled: false,
191191
},
192192
multiview: None,
193+
cache: None,
193194
});
194195

195196
Pipeline {

wgpu/src/quad/gradient.rs

+1
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ impl Pipeline {
174174
alpha_to_coverage_enabled: false,
175175
},
176176
multiview: None,
177+
cache: None,
177178
},
178179
);
179180

wgpu/src/quad/solid.rs

+1
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ impl Pipeline {
136136
alpha_to_coverage_enabled: false,
137137
},
138138
multiview: None,
139+
cache: None,
139140
});
140141

141142
Self { pipeline }

wgpu/src/triangle.rs

+2
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,7 @@ mod solid {
774774
depth_stencil: None,
775775
multisample: triangle::multisample_state(antialiasing),
776776
multiview: None,
777+
cache: None,
777778
},
778779
);
779780

@@ -955,6 +956,7 @@ mod gradient {
955956
depth_stencil: None,
956957
multisample: triangle::multisample_state(antialiasing),
957958
multiview: None,
959+
cache: None,
958960
},
959961
);
960962

wgpu/src/triangle/msaa.rs

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ impl Blit {
140140
alpha_to_coverage_enabled: false,
141141
},
142142
multiview: None,
143+
cache: None,
143144
});
144145

145146
Blit {

wgpu/src/window/compositor.rs

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ impl Compositor {
162162
),
163163
required_features: wgpu::Features::empty(),
164164
required_limits: required_limits.clone(),
165+
memory_hints: wgpu::MemoryHints::MemoryUsage,
165166
},
166167
None,
167168
)

0 commit comments

Comments
 (0)