Skip to content

Commit 0c51ddd

Browse files
committed
cargo: Bump windows-rs to 0.40
1 parent f89fe41 commit 0c51ddd

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ imgui = { version = "0.8", features = ["tables-api"], optional = true }
3333
winapi = { version = "0.3.9", features = ["d3d12", "winerror", "impl-default", "impl-debug"], optional = true }
3434

3535
[target.'cfg(windows)'.dependencies.windows]
36-
version = "0.39"
36+
version = "0.40"
3737
features = [
3838
"Win32_Foundation",
3939
"Win32_Graphics",
@@ -56,7 +56,7 @@ imgui-winit-support = { version = "0.8", default-features = false, features = ["
5656
winapi = { version = "0.3.9", features = ["d3d12", "d3d12sdklayers", "dxgi1_6", "winerror", "impl-default", "impl-debug", "winuser", "windowsx", "libloaderapi"] }
5757

5858
[target.'cfg(windows)'.dev-dependencies.windows]
59-
version = "0.39"
59+
version = "0.40"
6060
features = [
6161
"Win32_Foundation",
6262
"Win32_Graphics",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ let hr = unsafe {
116116
allocation.offset(),
117117
&buffer_desc,
118118
Direct3D12::D3D12_RESOURCE_STATE_COMMON,
119-
std::ptr::null(),
119+
None,
120120
&mut resource,
121121
)
122122
}?;

examples/d3d12-buffer-winrs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ fn main() -> Result<()> {
123123
allocation.offset(),
124124
&test_buffer_desc,
125125
D3D12_RESOURCE_STATE_COMMON,
126-
std::ptr::null(),
126+
None,
127127
&mut resource,
128128
)
129129
}?;
@@ -171,7 +171,7 @@ fn main() -> Result<()> {
171171
allocation.offset(),
172172
&test_buffer_desc,
173173
D3D12_RESOURCE_STATE_COMMON,
174-
std::ptr::null(),
174+
None,
175175
&mut resource,
176176
)
177177
}?;
@@ -219,7 +219,7 @@ fn main() -> Result<()> {
219219
allocation.offset(),
220220
&test_buffer_desc,
221221
D3D12_RESOURCE_STATE_COMMON,
222-
std::ptr::null(),
222+
None,
223223
&mut resource,
224224
)
225225
}?;

src/d3d12/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,10 @@ impl Allocator {
560560
unsafe {
561561
device.CheckFeatureSupport(
562562
D3D12_FEATURE_D3D12_OPTIONS,
563-
<*mut D3D12_FEATURE_DATA_D3D12_OPTIONS>::cast(&mut options),
564-
std::mem::size_of_val(&options) as u32,
563+
std::slice::from_raw_parts_mut(
564+
<*mut D3D12_FEATURE_DATA_D3D12_OPTIONS>::cast(&mut options),
565+
std::mem::size_of_val(&options),
566+
),
565567
)
566568
}
567569
.map_err(|e| {

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
//! allocation.offset(),
139139
//! &buffer_desc,
140140
//! Direct3D12::D3D12_RESOURCE_STATE_COMMON,
141-
//! std::ptr::null(),
141+
//! None,
142142
//! &mut resource,
143143
//! )
144144
//! }?;

0 commit comments

Comments
 (0)