Skip to content

Commit bfda722

Browse files
authored
Merge pull request #85 from Azkellas/bump-egui-wgpu
Bump egui to 0.28, wgpu to 0.20
2 parents 1a33f43 + d3f9cf0 commit bfda722

8 files changed

Lines changed: 112 additions & 72 deletions

File tree

Cargo.lock

Lines changed: 97 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mesh_to_sdf_client/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ exclude = ["assets/*", "ARCHITECTURE.md"]
2222
mesh_to_sdf = { path = "../mesh_to_sdf", version = "0.2.1", features = [
2323
"glam",
2424
] }
25-
egui = "0.27.2"
25+
egui = "0.28.1"
2626
egui-gizmo = "0.16.2"
27-
wgpu = { version = "0.19.4", default-features = false }
27+
wgpu = { version = "0.20.1", default-features = false }
2828
winit_input_helper = "0.16.0"
2929
bytemuck = { version = "1.16.1", features = ["derive"] }
3030
web-time = "1.1.0"
@@ -38,8 +38,8 @@ glam = { version = "0.28.0", default-features = true, features = [
3838
easy-gltf = { version = "1.1.1", default-features = true, features = ["names"] }
3939
image = "0.25.1"
4040
pollster = "0.3.0"
41-
egui-wgpu = "0.27.2"
42-
egui-winit = "0.27.2"
41+
egui-wgpu = "0.28.1"
42+
egui-winit = "0.28.1"
4343
log = "0.4.22"
4444
env_logger = "0.11.3"
4545
cfg-if = "1.0.0"

mesh_to_sdf_client/src/passes/mip_generation_pass.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ impl MipGenerationPass {
2020
module: &shader,
2121
entry_point: "vs_main",
2222
buffers: &[],
23+
compilation_options: wgpu::PipelineCompilationOptions::default(),
2324
},
2425
fragment: Some(wgpu::FragmentState {
2526
module: &shader,
2627
entry_point: "fs_main",
2728
targets: &[Some(wgpu::TextureFormat::Rgba8UnormSrgb.into())],
29+
compilation_options: wgpu::PipelineCompilationOptions::default(),
2830
}),
2931
primitive: wgpu::PrimitiveState {
3032
topology: wgpu::PrimitiveTopology::TriangleList,

mesh_to_sdf_client/src/passes/model_render_pass.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ impl ModelRenderPass {
5757
module: &draw_shader,
5858
entry_point: "main_vs",
5959
buffers: &[MeshVertex::desc()],
60+
compilation_options: wgpu::PipelineCompilationOptions::default(),
6061
},
6162
fragment: Some(wgpu::FragmentState {
6263
module: &draw_shader,
6364
entry_point: "main_fs",
6465
targets: &[Some(view_format.into())],
66+
compilation_options: wgpu::PipelineCompilationOptions::default(),
6567
}),
6668
primitive,
6769
depth_stencil: Some(wgpu::DepthStencilState {

mesh_to_sdf_client/src/passes/raymarch_pass.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,13 @@ impl RaymarchRenderPass {
5656
module: &draw_shader,
5757
entry_point: "main_vs",
5858
buffers: &[],
59+
compilation_options: wgpu::PipelineCompilationOptions::default(),
5960
},
6061
fragment: Some(wgpu::FragmentState {
6162
module: &draw_shader,
6263
entry_point: "main_fs",
6364
targets: &[Some(view_format.into())],
65+
compilation_options: wgpu::PipelineCompilationOptions::default(),
6466
}),
6567
primitive,
6668
depth_stencil: None,

mesh_to_sdf_client/src/passes/sdf_render_pass.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@ impl SdfRenderPass {
5050
module: &draw_shader,
5151
entry_point: "main_vs",
5252
buffers: &[],
53+
compilation_options: wgpu::PipelineCompilationOptions::default(),
5354
},
5455
fragment: Some(wgpu::FragmentState {
5556
module: &draw_shader,
5657
entry_point: "main_fs",
5758
targets: &[Some(view_format.into())],
59+
compilation_options: wgpu::PipelineCompilationOptions::default(),
5860
}),
5961
primitive,
6062
depth_stencil: Some(wgpu::DepthStencilState {

mesh_to_sdf_client/src/passes/shadow_pass.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ impl ShadowPass {
4141
module: &draw_shader,
4242
entry_point: "main_vs",
4343
buffers: &[MeshVertex::desc()],
44+
compilation_options: wgpu::PipelineCompilationOptions::default(),
4445
},
4546
fragment: None,
4647
primitive: wgpu::PrimitiveState::default(),

mesh_to_sdf_client/src/passes/voxel_render_pass.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ impl VoxelRenderPass {
6161
module: &draw_shader,
6262
entry_point: "main_vs",
6363
buffers: &[MeshVertex::desc()],
64+
compilation_options: wgpu::PipelineCompilationOptions::default(),
6465
},
6566
fragment: Some(wgpu::FragmentState {
6667
module: &draw_shader,
6768
entry_point: "main_fs",
6869
targets: &[Some(view_format.into())],
70+
compilation_options: wgpu::PipelineCompilationOptions::default(),
6971
}),
7072
primitive,
7173
depth_stencil: Some(wgpu::DepthStencilState {

0 commit comments

Comments
 (0)