Commit 3e710fe 1 parent d1f658f commit 3e710fe Copy full SHA for 3e710fe
File tree 3 files changed +9
-11
lines changed
3 files changed +9
-11
lines changed Original file line number Diff line number Diff line change @@ -133,7 +133,7 @@ impl Connection {
133
133
134
134
match raw_handle {
135
135
Win32 ( handle) => Ok ( NativeWidget {
136
- window_handle : handle. hwnd as HWND ,
136
+ window_handle : HWND ( handle. hwnd . get ( ) as * mut c_void ) ,
137
137
} ) ,
138
138
_ => Err ( Error :: IncompatibleNativeWidget ) ,
139
139
}
Original file line number Diff line number Diff line change @@ -145,7 +145,7 @@ impl Device {
145
145
146
146
unsafe {
147
147
let mut d3d11_device = Default :: default ( ) ;
148
- let mut d3d11_feature_level = ptr:: null_mut ( ) ;
148
+ let d3d11_feature_level = ptr:: null_mut ( ) ;
149
149
let mut d3d11_device_context = Default :: default ( ) ;
150
150
let result = D3D11CreateDevice (
151
151
None ,
@@ -218,12 +218,10 @@ impl Device {
218
218
/// The reference count on the D3D 11 device is increased before returning.
219
219
#[ inline]
220
220
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 ,
227
225
}
228
226
}
229
227
Original file line number Diff line number Diff line change @@ -171,8 +171,8 @@ impl Device {
171
171
CPUAccessFlags : 0 ,
172
172
MiscFlags : D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX . 0 as u32 ,
173
173
} ;
174
- let mut d3d11_texture = Default :: default ( ) ;
175
- let mut result =
174
+ let d3d11_texture = Default :: default ( ) ;
175
+ let result =
176
176
self . d3d11_device
177
177
. CreateTexture2D ( & d3d11_texture2d_desc, None , d3d11_texture) ;
178
178
if !result. is_ok ( ) {
@@ -190,7 +190,7 @@ impl Device {
190
190
// across contexts.
191
191
let result = dxgi_resource. as_ref ( ) . unwrap ( ) . GetSharedHandle ( ) ;
192
192
assert ! ( result. is_ok( ) ) ;
193
- let mut dxgi_share_handle = result. unwrap ( ) ;
193
+ let dxgi_share_handle = result. unwrap ( ) ;
194
194
assert_ne ! ( dxgi_share_handle, INVALID_HANDLE_VALUE ) ;
195
195
196
196
// Tell GL about the share handle.
You can’t perform that action at this time.
0 commit comments