Upgrade wgpu

This commit is contained in:
Maximilian Ammann 2021-12-19 12:56:26 +01:00
parent a81e482a9c
commit ce606fe18e
3 changed files with 3 additions and 4 deletions

View File

@ -62,7 +62,7 @@ style-spec = { path = "./libs/style_spec" }
cgmath = "0.18"
# Rendering
wgpu = { version = "0.11" }
wgpu = { version = "0.12" }
lyon = { version = "0.17", features = ["extra"] } # extra for rust logo
lyon_path = "0.17"

View File

@ -54,8 +54,8 @@ pub fn create_map_render_pipeline_description<'a>(
front_face: wgpu::FrontFace::Ccw,
strip_index_format: None,
cull_mode: None, // TODO Maps look the same from he bottom and above
clamp_depth: false,
conservative: false,
unclipped_depth: false
},
depth_stencil: Some(wgpu::DepthStencilState {
format: DEPTH_TEXTURE_FORMAT,
@ -74,6 +74,7 @@ pub fn create_map_render_pipeline_description<'a>(
mask: !0,
alpha_to_coverage_enabled: false,
},
multiview: None
};
descriptor
}

View File

@ -4,7 +4,6 @@ struct CameraUniform {
};
[[block]]
struct GlobalsUniform {
camera: CameraUniform;
};
@ -20,7 +19,6 @@ struct PrimitiveUniform {
pad2: i32;
};
[[block]]
struct Primitives {
primitives: [[stride(48)]] array<PrimitiveUniform, 256>;
};