Merge #845 · gfx-rs/wgpu@1de388a (original) (raw)

5 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -28,20 +28,20 @@ cross = ["wgc/cross"]
28 28 [target.'cfg(not(target_arch = "wasm32"))'.dependencies.wgc]
29 29 package = "wgpu-core"
30 30 git = "https://github.com/gfx-rs/wgpu"
31 -rev = "eef478fc5d4de9c114084a4f8a7a3d434697fdba"
31 +rev = "e430cf4bcc10aea447f637067fe81c75c80f0e46"
32 32 features = ["raw-window-handle"]
33 33
34 34 [target.'cfg(target_arch = "wasm32")'.dependencies.wgc]
35 35 package = "wgpu-core"
36 36 git = "https://github.com/gfx-rs/wgpu"
37 -rev = "eef478fc5d4de9c114084a4f8a7a3d434697fdba"
37 +rev = "e430cf4bcc10aea447f637067fe81c75c80f0e46"
38 38 features = ["raw-window-handle"]
39 39 optional = true
40 40
41 41 [dependencies.wgt]
42 42 package = "wgpu-types"
43 43 git = "https://github.com/gfx-rs/wgpu"
44 -rev = "eef478fc5d4de9c114084a4f8a7a3d434697fdba"
44 +rev = "e430cf4bcc10aea447f637067fe81c75c80f0e46"
45 45
46 46 [dependencies]
47 47 arrayvec = "0.5"
Original file line number Diff line number Diff line change
@@ -507,6 +507,7 @@ impl framework::Example for Example {
507 507 topology: wgpu::PrimitiveTopology::TriangleList,
508 508 front_face: wgpu::FrontFace::Ccw,
509 509 cull_mode: Some(wgpu::Face::Back),
510 +clamp_depth: device.features().contains(wgpu::Features::DEPTH_CLAMPING),
510 511 ..Default::default()
511 512 },
512 513 depth_stencil: Some(wgpu::DepthStencilState {
@@ -519,7 +520,6 @@ impl framework::Example for Example {
519 520 slope_scale: 2.0,
520 521 clamp: 0.0,
521 522 },
522 -clamp_depth: device.features().contains(wgpu::Features::DEPTH_CLAMPING),
523 523 }),
524 524 multisample: wgpu::MultisampleState::default(),
525 525 });
@@ -646,7 +646,6 @@ impl framework::Example for Example {
646 646 depth_compare: wgpu::CompareFunction::Less,
647 647 stencil: wgpu::StencilState::default(),
648 648 bias: wgpu::DepthBiasState::default(),
649 -clamp_depth: false,
650 649 }),
651 650 multisample: wgpu::MultisampleState::default(),
652 651 });
Original file line number Diff line number Diff line change
@@ -232,7 +232,6 @@ impl framework::Example for Skybox {
232 232 depth_compare: wgpu::CompareFunction::LessEqual,
233 233 stencil: wgpu::StencilState::default(),
234 234 bias: wgpu::DepthBiasState::default(),
235 -clamp_depth: false,
236 235 }),
237 236 multisample: wgpu::MultisampleState::default(),
238 237 });
@@ -263,7 +262,6 @@ impl framework::Example for Skybox {
263 262 depth_compare: wgpu::CompareFunction::LessEqual,
264 263 stencil: wgpu::StencilState::default(),
265 264 bias: wgpu::DepthBiasState::default(),
266 -clamp_depth: false,
267 265 }),
268 266 multisample: wgpu::MultisampleState::default(),
269 267 });
Original file line number Diff line number Diff line change
@@ -570,7 +570,6 @@ impl framework::Example for Example {
570 570 depth_compare: wgpu::CompareFunction::Less,
571 571 stencil: wgpu::StencilState::default(),
572 572 bias: wgpu::DepthBiasState::default(),
573 -clamp_depth: false,
574 573 }),
575 574 // No multisampling is used.
576 575 multisample: wgpu::MultisampleState::default(),
@@ -605,7 +604,6 @@ impl framework::Example for Example {
605 604 depth_compare: wgpu::CompareFunction::Less,
606 605 stencil: wgpu::StencilState::default(),
607 606 bias: wgpu::DepthBiasState::default(),
608 -clamp_depth: false,
609 607 }),
610 608 multisample: wgpu::MultisampleState::default(),
611 609 });
Original file line number Diff line number Diff line change
@@ -603,6 +603,8 @@ fn map_primitive_state(primitive: &wgt::PrimitiveState) -> web_sys::GpuPrimitive
603 603 PrimitiveTopology::TriangleStrip => pt::TriangleStrip,
604 604 });
605 605
606 +//mapped.clamp_depth(primitive.clamp_depth);
607 +
606 608 mapped
607 609 }
608 610
@@ -647,7 +649,6 @@ fn map_stencil_state_face(desc: &wgt::StencilFaceState) -> web_sys::GpuStencilFa
647 649
648 650 fn map_depth_stencil_state(desc: &wgt::DepthStencilState) -> web_sys::GpuDepthStencilState {
649 651 let mut mapped = web_sys::GpuDepthStencilState::new(map_texture_format(desc.format));
650 - mapped.clamp_depth(desc.clamp_depth);
651 652 mapped.depth_bias(desc.bias.constant);
652 653 mapped.depth_bias_clamp(desc.bias.clamp);
653 654 mapped.depth_bias_slope_scale(desc.bias.slope_scale);