@@ -12,27 +12,27 @@ use crate::gl;
12
12
use crate :: gl:: types:: { GLenum , GLint , GLuint } ;
13
13
use crate :: gl_utils;
14
14
use euclid:: default:: Size2D ;
15
- use windows:: core:: Interface ;
16
- use windows:: Win32 :: Graphics :: Gdi :: { GetDC , ReleaseDC } ;
17
- use windows:: Win32 :: Graphics :: OpenGL :: { GetPixelFormat , SwapBuffers } ;
18
- use windows:: Win32 :: UI :: WindowsAndMessaging :: GetWindowRect ;
19
15
use std:: fmt:: { self , Debug , Formatter } ;
20
16
use std:: marker:: PhantomData ;
21
17
use std:: mem;
22
18
use std:: os:: raw:: c_void;
23
19
use std:: ptr;
24
20
use std:: thread;
25
- use windows:: Win32 :: Graphics :: Dxgi :: IDXGIResource ;
26
- use windows:: Win32 :: Graphics :: Dxgi :: Common :: DXGI_FORMAT_R8G8B8A8_UNORM ;
27
- use windows:: Win32 :: Graphics :: Dxgi :: Common :: DXGI_SAMPLE_DESC ;
21
+ use windows:: core:: Interface ;
28
22
use windows:: Win32 :: Foundation :: HANDLE ;
29
23
use windows:: Win32 :: Foundation :: HWND ;
24
+ use windows:: Win32 :: Foundation :: INVALID_HANDLE_VALUE ;
30
25
use windows:: Win32 :: Graphics :: Direct3D11 :: { ID3D11Texture2D , D3D11_USAGE_DEFAULT } ;
31
26
use windows:: Win32 :: Graphics :: Direct3D11 :: { D3D11_BIND_RENDER_TARGET , D3D11_BIND_SHADER_RESOURCE } ;
32
27
use windows:: Win32 :: Graphics :: Direct3D11 :: {
33
28
D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX , D3D11_TEXTURE2D_DESC ,
34
29
} ;
35
- use windows:: Win32 :: Foundation :: INVALID_HANDLE_VALUE ;
30
+ use windows:: Win32 :: Graphics :: Dxgi :: Common :: DXGI_FORMAT_R8G8B8A8_UNORM ;
31
+ use windows:: Win32 :: Graphics :: Dxgi :: Common :: DXGI_SAMPLE_DESC ;
32
+ use windows:: Win32 :: Graphics :: Dxgi :: IDXGIResource ;
33
+ use windows:: Win32 :: Graphics :: Gdi :: { GetDC , ReleaseDC } ;
34
+ use windows:: Win32 :: Graphics :: OpenGL :: { GetPixelFormat , SwapBuffers } ;
35
+ use windows:: Win32 :: UI :: WindowsAndMessaging :: GetWindowRect ;
36
36
37
37
const SURFACE_GL_TEXTURE_TARGET : GLenum = gl:: TEXTURE_2D ;
38
38
@@ -172,7 +172,7 @@ impl Device {
172
172
CPUAccessFlags : 0 ,
173
173
MiscFlags : D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX . 0 as u32 ,
174
174
} ;
175
- let mut d3d11_texture= Default :: default ( ) ;
175
+ let mut d3d11_texture = Default :: default ( ) ;
176
176
let mut result =
177
177
self . d3d11_device
178
178
. CreateTexture2D ( & d3d11_texture2d_desc, None , d3d11_texture) ;
@@ -193,7 +193,7 @@ impl Device {
193
193
assert ! ( result. is_ok( ) ) ;
194
194
let mut dxgi_share_handle = result. unwrap ( ) ;
195
195
assert_ne ! ( dxgi_share_handle, INVALID_HANDLE_VALUE ) ;
196
-
196
+
197
197
// Tell GL about the share handle.
198
198
let d3d11_texture = d3d11_texture;
199
199
let ok = ( dx_interop_functions. DXSetResourceShareHandleNV ) (
@@ -246,7 +246,7 @@ impl Device {
246
246
247
247
// FIXME(pcwalton): Do we need to acquire the keyed mutex, or does the GL driver do
248
248
// that?
249
-
249
+
250
250
let d3d11_texture = ( * d3d11_texture) . to_owned ( ) . unwrap ( ) ;
251
251
252
252
Ok ( Surface {
@@ -392,17 +392,16 @@ impl Device {
392
392
unsafe {
393
393
// Create a new texture wrapping the shared handle.
394
394
let mut local_d3d11_texture = Default :: default ( ) ;
395
- let result = self . d3d11_device . OpenSharedResource (
396
- dxgi_share_handle,
397
- & mut local_d3d11_texture,
398
- ) ;
395
+ let result = self
396
+ . d3d11_device
397
+ . OpenSharedResource ( dxgi_share_handle, & mut local_d3d11_texture) ;
399
398
if result. is_err ( ) || local_d3d11_texture. is_none ( ) {
400
399
return Err ( (
401
400
Error :: SurfaceImportFailed ( WindowingApiError :: Failed ) ,
402
401
surface,
403
402
) ) ;
404
403
}
405
- let local_d3d11_texture : ID3D11Texture2D = local_d3d11_texture. unwrap ( ) ;
404
+ let local_d3d11_texture: ID3D11Texture2D = local_d3d11_texture. unwrap ( ) ;
406
405
// Make GL aware of the connection between the share handle and the texture.
407
406
let ok = ( dx_interop_functions. DXSetResourceShareHandleNV ) (
408
407
local_d3d11_texture. as_raw ( ) as * mut c_void ,
0 commit comments