Skip to content

Commit 39ba403

Browse files
kelpsyberrykelpsyberry
committed
Update dependencies
1 parent a3516d8 commit 39ba403

File tree

12 files changed

+450
-420
lines changed

12 files changed

+450
-420
lines changed

‎Cargo.lock

+424-394
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎core/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ debugger-hooks = ["bft-r", "bft-w"]
3232

3333
[dependencies]
3434
emu-utils = { git = "https://github.com/kelpsyberry/emu-utils" }
35-
proc-bitfield = { version = "0.4", features = ["nightly"] }
35+
proc-bitfield = { version = "0.5", features = ["nightly"] }
3636
bitflags = "2.6"
3737
cfg-if = "1.0"
3838
slog = { version = "2.7", optional = true }

‎frontend/desktop/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ dust-wgpu-3d = { path = "../../render/wgpu-3d", features = ["threaded"] }
4141

4242
# UI
4343
winit = { version = "0.30", features = ["serde"] }
44-
wgpu = "22.0"
44+
wgpu = "23.0"
4545
imgui = { version = "0.12", features = ["docking", "tables-api"] }
4646
imgui-winit-support = { git = "https://github.com/kelpsyberry/imgui-rs" }
4747
imgui-wgpu = { git = "https://github.com/kelpsyberry/imgui-wgpu" }
4848
opener = "0.7"
4949

5050
# System resources
51-
rfd = "0.14"
51+
rfd = "0.15"
5252
directories = "5.0"
5353
copypasta = "0.10"
5454
cpal = "0.15"
@@ -58,15 +58,15 @@ sync_file = "0.2"
5858

5959
# Utils
6060
ahash = "0.8"
61-
pollster = "0.3"
61+
pollster = "0.4"
6262
crossbeam-channel = "0.5"
6363
parking_lot = "0.12"
64-
bitflags = "2.5"
65-
miniz_oxide = { version = "0.7", features = ["simd"] }
64+
bitflags = "2.6"
65+
miniz_oxide = { version = "0.8", features = ["simd"] }
6666
png = { version = "0.17", optional = true }
6767
fatfs = { version = "0.3", optional = true }
6868
tempfile = { version = "3.10", optional = true }
69-
proc-bitfield = { version = "0.4", features = ["nightly"] }
69+
proc-bitfield = { version = "0.5", features = ["nightly"] }
7070

7171
# Config
7272
serde = { version = "1.0", features = ["derive"] }
@@ -87,6 +87,6 @@ realfft = { version = "3.0", optional = true }
8787
gdb-protocol = { version = "0.1", optional = true }
8888

8989
[target.'cfg(target_os = "macos")'.dependencies]
90-
cocoa = "0.25"
90+
cocoa = "0.26"
9191
objc = "0.2"
9292
tempfile = "3.10"

‎render/soft-2d/base/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ publish = false
88

99
[dependencies]
1010
dust-core = { path = "../../../core" }
11-
proc-bitfield = { version = "0.4", features = ["nightly"] }
11+
proc-bitfield = { version = "0.5", features = ["nightly"] }

‎render/soft-3d/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ publish = false
66

77
[dependencies]
88
dust-core = { path = "../../core" }
9-
proc-bitfield = { version = "0.4", features = ["nightly"] }
9+
proc-bitfield = { version = "0.5", features = ["nightly"] }

‎render/wgpu-2d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ publish = false
88
dust-core = { path = "../../core" }
99
emu-utils = { git = "https://github.com/kelpsyberry/emu-utils", features = ["triple-buffer"] }
1010
dust-soft-2d-base = { path = "../soft-2d/base" }
11-
proc-bitfield = { version = "0.4", features = ["nightly"] }
12-
wgpu = "22.0"
11+
proc-bitfield = { version = "0.5", features = ["nightly"] }
12+
wgpu = "23.0"
1313
crossbeam-channel = "0.5"
1414
parking_lot = "0.12"

‎render/wgpu-2d/src/common/gfx.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ impl GfxThreadData {
425425

426426
vertex: wgpu::VertexState {
427427
module: &shader_module,
428-
entry_point: "vs_main",
428+
entry_point: None,
429429
buffers: &[],
430430
compilation_options: Default::default(),
431431
},
@@ -446,7 +446,7 @@ impl GfxThreadData {
446446

447447
fragment: Some(wgpu::FragmentState {
448448
module: &shader_module,
449-
entry_point: "fs_main",
449+
entry_point: None,
450450
targets: &[Some(wgpu::ColorTargetState {
451451
format: wgpu::TextureFormat::Rgba8Unorm,
452452
blend: None,

‎render/wgpu-3d/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ threaded = ["emu-utils", "crossbeam-channel", "parking_lot"]
1111
dust-core = { path = "../../core", features = ["3d-hi-res-coords"] }
1212
dust-soft-3d = { path = "../soft-3d" }
1313
emu-utils = { git = "https://github.com/kelpsyberry/emu-utils", features = ["triple-buffer"], optional = true}
14-
proc-bitfield = { version = "0.4", features = ["nightly"] }
14+
proc-bitfield = { version = "0.5", features = ["nightly"] }
1515
ahash = "0.8"
16-
wgpu = "22.0"
16+
wgpu = "23.0"
1717
crossbeam-channel = { version = "0.5", optional = true }
1818
parking_lot = { version = "0.12", optional = true }

‎render/wgpu-3d/src/render/edge_marking.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub(crate) fn create_pipeline(
116116

117117
vertex: wgpu::VertexState {
118118
module: &shader_module,
119-
entry_point: "vs_main",
119+
entry_point: None,
120120
buffers: &[],
121121
compilation_options: Default::default(),
122122
},
@@ -137,7 +137,7 @@ pub(crate) fn create_pipeline(
137137

138138
fragment: Some(wgpu::FragmentState {
139139
module: &shader_module,
140-
entry_point: "fs_main",
140+
entry_point: None,
141141
targets: &[Some(wgpu::ColorTargetState {
142142
format: wgpu::TextureFormat::Rgba8Unorm,
143143
blend: Some(wgpu::BlendState::ALPHA_BLENDING),

‎render/wgpu-3d/src/render/fog.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ pub(crate) fn create_pipeline(
121121

122122
vertex: wgpu::VertexState {
123123
module: &shader_module,
124-
entry_point: "vs_main",
124+
entry_point: None,
125125
buffers: &[],
126126
compilation_options: Default::default(),
127127
},
@@ -142,7 +142,7 @@ pub(crate) fn create_pipeline(
142142

143143
fragment: Some(wgpu::FragmentState {
144144
module: &shader_module,
145-
entry_point: "fs_main",
145+
entry_point: None,
146146
targets: &[Some(wgpu::ColorTargetState {
147147
format: wgpu::TextureFormat::Rgba8Unorm,
148148
blend: None,

‎render/wgpu-3d/src/render/opaque.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ pub(crate) fn create_pipeline(
184184

185185
vertex: wgpu::VertexState {
186186
module: &shader_module,
187-
entry_point: "vs_main",
187+
entry_point: None,
188188
buffers: &[wgpu::VertexBufferLayout {
189189
array_stride: mem::size_of::<Vertex>() as u64,
190190
step_mode: wgpu::VertexStepMode::Vertex,
@@ -211,7 +211,7 @@ pub(crate) fn create_pipeline(
211211

212212
fragment: Some(wgpu::FragmentState {
213213
module: &shader_module,
214-
entry_point: "fs_main",
214+
entry_point: None,
215215
targets: if pipeline.attrs_enabled() {
216216
&[
217217
Some(wgpu::ColorTargetState {

‎render/wgpu-3d/src/render/trans.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ pub(crate) fn create_pipeline(
221221

222222
vertex: wgpu::VertexState {
223223
module: &opaque_shader_module,
224-
entry_point: "vs_main",
224+
entry_point: None,
225225
buffers: &[wgpu::VertexBufferLayout {
226226
array_stride: mem::size_of::<Vertex>() as u64,
227227
step_mode: wgpu::VertexStepMode::Vertex,
@@ -248,7 +248,7 @@ pub(crate) fn create_pipeline(
248248

249249
fragment: Some(wgpu::FragmentState {
250250
module: &opaque_shader_module,
251-
entry_point: "fs_main",
251+
entry_point: None,
252252
targets: if pipeline.attrs_enabled() {
253253
&[
254254
Some(wgpu::ColorTargetState {
@@ -304,7 +304,7 @@ pub(crate) fn create_pipeline(
304304

305305
vertex: wgpu::VertexState {
306306
module: &trans_shader_module,
307-
entry_point: "vs_main",
307+
entry_point: None,
308308
buffers: &[wgpu::VertexBufferLayout {
309309
array_stride: mem::size_of::<Vertex>() as u64,
310310
step_mode: wgpu::VertexStepMode::Vertex,
@@ -332,7 +332,7 @@ pub(crate) fn create_pipeline(
332332

333333
fragment: Some(wgpu::FragmentState {
334334
module: &trans_shader_module,
335-
entry_point: "fs_main",
335+
entry_point: None,
336336
targets: &trans_fragment_targets,
337337
compilation_options: Default::default(),
338338
}),

0 commit comments

Comments
 (0)