Skip to content

Commit 3e710fe

Browse files
committed
Fix warning
1 parent d1f658f commit 3e710fe

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

src/platform/windows/wgl/connection.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ impl Connection {
133133

134134
match raw_handle {
135135
Win32(handle) => Ok(NativeWidget {
136-
window_handle: handle.hwnd as HWND,
136+
window_handle: HWND(handle.hwnd.get() as *mut c_void),
137137
}),
138138
_ => Err(Error::IncompatibleNativeWidget),
139139
}

src/platform/windows/wgl/device.rs

+5-7
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ impl Device {
145145

146146
unsafe {
147147
let mut d3d11_device = Default::default();
148-
let mut d3d11_feature_level = ptr::null_mut();
148+
let d3d11_feature_level = ptr::null_mut();
149149
let mut d3d11_device_context = Default::default();
150150
let result = D3D11CreateDevice(
151151
None,
@@ -218,12 +218,10 @@ impl Device {
218218
/// The reference count on the D3D 11 device is increased before returning.
219219
#[inline]
220220
pub fn native_device(&self) -> NativeDevice {
221-
unsafe {
222-
let d3d11_device = self.d3d11_device.clone();
223-
NativeDevice {
224-
d3d11_device,
225-
gl_dx_interop_device: self.gl_dx_interop_device,
226-
}
221+
let d3d11_device = self.d3d11_device.clone();
222+
NativeDevice {
223+
d3d11_device,
224+
gl_dx_interop_device: self.gl_dx_interop_device,
227225
}
228226
}
229227

src/platform/windows/wgl/surface.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@ impl Device {
171171
CPUAccessFlags: 0,
172172
MiscFlags: D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX.0 as u32,
173173
};
174-
let mut d3d11_texture = Default::default();
175-
let mut result =
174+
let d3d11_texture = Default::default();
175+
let result =
176176
self.d3d11_device
177177
.CreateTexture2D(&d3d11_texture2d_desc, None, d3d11_texture);
178178
if !result.is_ok() {
@@ -190,7 +190,7 @@ impl Device {
190190
// across contexts.
191191
let result = dxgi_resource.as_ref().unwrap().GetSharedHandle();
192192
assert!(result.is_ok());
193-
let mut dxgi_share_handle = result.unwrap();
193+
let dxgi_share_handle = result.unwrap();
194194
assert_ne!(dxgi_share_handle, INVALID_HANDLE_VALUE);
195195

196196
// Tell GL about the share handle.

0 commit comments

Comments
 (0)