summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-07-19 19:10:23 +0200
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2024-09-20 00:14:47 +0200
commita5e69cfb5f7856e4d139ef58e5d022b9d408b542 (patch)
tree27004395eda5917e2a0bb77f440ac05ff8d8352d
parentaed9a03e3cc30c68488f6e177e2ea0513e7ffc99 (diff)
downloadiced-a5e69cfb5f7856e4d139ef58e5d022b9d408b542.tar.gz
iced-a5e69cfb5f7856e4d139ef58e5d022b9d408b542.tar.bz2
iced-a5e69cfb5f7856e4d139ef58e5d022b9d408b542.zip
Update `wgpu` to `22.0`
-rw-r--r--Cargo.toml4
-rw-r--r--benches/wgpu.rs1
-rw-r--r--examples/custom_shader/src/scene/pipeline.rs2
-rw-r--r--examples/integration/src/main.rs2
-rw-r--r--examples/integration/src/scene.rs1
-rw-r--r--wgpu/src/color.rs1
-rw-r--r--wgpu/src/image/mod.rs1
-rw-r--r--wgpu/src/quad/gradient.rs1
-rw-r--r--wgpu/src/quad/solid.rs1
-rw-r--r--wgpu/src/triangle.rs2
-rw-r--r--wgpu/src/triangle/msaa.rs1
-rw-r--r--wgpu/src/window/compositor.rs1
12 files changed, 16 insertions, 2 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 000ca6ba..629b1c9d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -148,7 +148,7 @@ cosmic-text = "0.12"
dark-light = "1.0"
futures = "0.3"
glam = "0.25"
-glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "ce412b3954118d2a4ae20de2d6959247d6f7ed76" }
+glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "0d7ba1bba4dd71eb88d2cface5ce649db2413cb7" }
guillotiere = "0.6"
half = "2.2"
image = { version = "0.24", default-features = false }
@@ -181,7 +181,7 @@ wasm-bindgen-futures = "0.4"
wasm-timer = "0.2"
web-sys = "0.3.69"
web-time = "1.1"
-wgpu = "0.20.1"
+wgpu = "22.0"
winapi = "0.3"
window_clipboard = "0.4.1"
winit = { git = "https://github.com/iced-rs/winit.git", rev = "254d6b3420ce4e674f516f7a2bd440665e05484d" }
diff --git a/benches/wgpu.rs b/benches/wgpu.rs
index 0e407253..0605294f 100644
--- a/benches/wgpu.rs
+++ b/benches/wgpu.rs
@@ -66,6 +66,7 @@ fn benchmark<'a>(
label: None,
required_features: wgpu::Features::empty(),
required_limits: wgpu::Limits::default(),
+ memory_hints: wgpu::MemoryHints::MemoryUsage,
},
None,
))
diff --git a/examples/custom_shader/src/scene/pipeline.rs b/examples/custom_shader/src/scene/pipeline.rs
index 20ca6a67..84a3e5e2 100644
--- a/examples/custom_shader/src/scene/pipeline.rs
+++ b/examples/custom_shader/src/scene/pipeline.rs
@@ -282,6 +282,7 @@ impl Pipeline {
wgpu::PipelineCompilationOptions::default(),
}),
multiview: None,
+ cache: None,
});
let depth_pipeline = DepthPipeline::new(
@@ -518,6 +519,7 @@ impl DepthPipeline {
wgpu::PipelineCompilationOptions::default(),
}),
multiview: None,
+ cache: None,
});
Self {
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 5b64cbd1..87a5b22b 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -102,6 +102,8 @@ pub fn main() -> Result<(), winit::error::EventLoopError> {
required_features: adapter_features
& wgpu::Features::default(),
required_limits: wgpu::Limits::default(),
+ memory_hints:
+ wgpu::MemoryHints::MemoryUsage,
},
None,
)
diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs
index f3a7a194..15f97e08 100644
--- a/examples/integration/src/scene.rs
+++ b/examples/integration/src/scene.rs
@@ -101,5 +101,6 @@ fn build_pipeline(
alpha_to_coverage_enabled: false,
},
multiview: None,
+ cache: None,
})
}
diff --git a/wgpu/src/color.rs b/wgpu/src/color.rs
index f5c4af30..effac8da 100644
--- a/wgpu/src/color.rs
+++ b/wgpu/src/color.rs
@@ -143,6 +143,7 @@ pub fn convert(
depth_stencil: None,
multisample: wgpu::MultisampleState::default(),
multiview: None,
+ cache: None,
});
let texture = device.create_texture(&wgpu::TextureDescriptor {
diff --git a/wgpu/src/image/mod.rs b/wgpu/src/image/mod.rs
index d72303ea..cf83c3f2 100644
--- a/wgpu/src/image/mod.rs
+++ b/wgpu/src/image/mod.rs
@@ -190,6 +190,7 @@ impl Pipeline {
alpha_to_coverage_enabled: false,
},
multiview: None,
+ cache: None,
});
Pipeline {
diff --git a/wgpu/src/quad/gradient.rs b/wgpu/src/quad/gradient.rs
index b915a6b7..207b0d73 100644
--- a/wgpu/src/quad/gradient.rs
+++ b/wgpu/src/quad/gradient.rs
@@ -174,6 +174,7 @@ impl Pipeline {
alpha_to_coverage_enabled: false,
},
multiview: None,
+ cache: None,
},
);
diff --git a/wgpu/src/quad/solid.rs b/wgpu/src/quad/solid.rs
index 060ef881..86f118d6 100644
--- a/wgpu/src/quad/solid.rs
+++ b/wgpu/src/quad/solid.rs
@@ -136,6 +136,7 @@ impl Pipeline {
alpha_to_coverage_enabled: false,
},
multiview: None,
+ cache: None,
});
Self { pipeline }
diff --git a/wgpu/src/triangle.rs b/wgpu/src/triangle.rs
index 0a2a2174..3d0869e7 100644
--- a/wgpu/src/triangle.rs
+++ b/wgpu/src/triangle.rs
@@ -774,6 +774,7 @@ mod solid {
depth_stencil: None,
multisample: triangle::multisample_state(antialiasing),
multiview: None,
+ cache: None,
},
);
@@ -955,6 +956,7 @@ mod gradient {
depth_stencil: None,
multisample: triangle::multisample_state(antialiasing),
multiview: None,
+ cache: None,
},
);
diff --git a/wgpu/src/triangle/msaa.rs b/wgpu/src/triangle/msaa.rs
index 1f230b71..ec06e747 100644
--- a/wgpu/src/triangle/msaa.rs
+++ b/wgpu/src/triangle/msaa.rs
@@ -140,6 +140,7 @@ impl Blit {
alpha_to_coverage_enabled: false,
},
multiview: None,
+ cache: None,
});
Blit {
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index 2e938c77..0cfd49b7 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -162,6 +162,7 @@ impl Compositor {
),
required_features: wgpu::Features::empty(),
required_limits: required_limits.clone(),
+ memory_hints: wgpu::MemoryHints::MemoryUsage,
},
None,
)