Skip to content

Commit f84d6da

Browse files
MarijnS95ErichDonGubler
authored andcommitted
[d3d12 wgl] Upgrade to windows 0.61 crates
https://github.com/microsoft/windows-rs/releases/tag/63
1 parent f0aab50 commit f84d6da

File tree

5 files changed

+17
-59
lines changed

5 files changed

+17
-59
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ gpu-descriptor = "0.3.2"
213213
gpu-allocator = { version = "0.28", default-features = false, features = ["hashbrown"] }
214214
range-alloc = "0.1"
215215
mach-dxcompiler-rs = { version = "0.1.4", default-features = false } # remember to increase max_shader_model if applicable
216-
windows-core = { version = "0.59", default-features = false }
216+
windows-core = { version = "0.61", default-features = false }
217217

218218
# Gles dependencies
219219
khronos-egl = "6"
@@ -223,7 +223,7 @@ glutin-winit = { version = "0.4", default-features = false }
223223
glutin_wgl_sys = "0.6"
224224

225225
# DX12 and GLES dependencies
226-
windows = { version = "0.59", default-features = false }
226+
windows = { version = "0.61", default-features = false }
227227

228228
# wasm32 dependencies
229229
console_error_panic_hook = "0.1.5"

wgpu-hal/src/dx12/device.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1875,8 +1875,8 @@ impl crate::Device for super::Device {
18751875
DepthBias: bias.constant,
18761876
DepthBiasClamp: bias.clamp,
18771877
SlopeScaledDepthBias: bias.slope_scale,
1878-
DepthClipEnable: Foundation::BOOL::from(!desc.primitive.unclipped_depth),
1879-
MultisampleEnable: Foundation::BOOL::from(desc.multisample.count > 1),
1878+
DepthClipEnable: windows_core::BOOL::from(!desc.primitive.unclipped_depth),
1879+
MultisampleEnable: windows_core::BOOL::from(desc.multisample.count > 1),
18801880
ForcedSampleCount: 0,
18811881
AntialiasedLineEnable: false.into(),
18821882
ConservativeRaster: if desc.primitive.conservative {
@@ -1905,7 +1905,7 @@ impl crate::Device for super::Device {
19051905
RasterizedStream: 0,
19061906
};
19071907
let blend_state = Direct3D12::D3D12_BLEND_DESC {
1908-
AlphaToCoverageEnable: Foundation::BOOL::from(
1908+
AlphaToCoverageEnable: windows_core::BOOL::from(
19091909
desc.multisample.alpha_to_coverage_enabled,
19101910
),
19111911
IndependentBlendEnable: true.into(),

wgpu-hal/src/dx12/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ use hashbrown::HashMap;
9393
use parking_lot::{Mutex, RwLock};
9494
use suballocation::Allocator;
9595
use windows::{
96-
core::{Free, Interface},
96+
core::{Free as _, Interface},
9797
Win32::{
9898
Foundation,
9999
Graphics::{Direct3D, Direct3D12, DirectComposition, Dxgi},

wgpu-types/src/counters.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ pub struct AllocatorReport {
181181
/// Sum of the memory used by all allocations, in bytes.
182182
pub total_allocated_bytes: u64,
183183
/// Sum of the memory reserved by all memory blocks including unallocated regions, in bytes.
184+
// XXX: Rename to total_capacity_bytes following the rename at https://github.com/Traverse-Research/gpu-allocator/pull/266?
184185
pub total_reserved_bytes: u64,
185186
}
186187

0 commit comments

Comments
 (0)