[vlc-devel] [PATCH 01/14] d3d11: rename d3d11_handle_t to d3d11_device_t

[Steve Lhomme]

---
 modules/codec/avcodec/d3d11va.c         | 2 +-
 modules/video_chroma/d3d11_fmt.c        | 5 ++---
 modules/video_chroma/d3d11_fmt.h        | 7 +++----
 modules/video_output/win32/direct3d11.c | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/modules/codec/avcodec/d3d11va.c b/modules/codec/avcodec/d3d11va.c
index cfea13cc7b..4536bc2cd7 100644
--- a/modules/codec/avcodec/d3d11va.c
+++ b/modules/codec/avcodec/d3d11va.c
@@ -427,7 +427,7 @@ static int D3dCreateDevice(vlc_va_t *va)
     }
 
     /* */
-    d3d11_handle_t hd3d11;
+    d3d11_device_t hd3d11;
     hr = D3D11_CreateDevice(VLC_OBJECT(va), dx_sys->hdecoder_dll, true, &hd3d11);
     if (FAILED(hr)) {
         msg_Err(va, "D3D11CreateDevice failed. (hr=0x%lX)", hr);
diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index e3b5e4e0cd..b414d30ddd 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -131,8 +131,7 @@ int AllocateShaderView(vlc_object_t *obj, ID3D11Device *d3ddevice,
 }
 
 HRESULT D3D11_CreateDevice(vlc_object_t *obj, HINSTANCE hdecoder_dll,
-                                         bool hw_decoding,
-                                         d3d11_handle_t *p_hd3d11)
+                           bool hw_decoding, d3d11_device_t *p_hd3d11)
 {
 #if !VLC_WINSTORE_APP
 # define D3D11CreateDevice(args...)             pf_CreateDevice(args)
@@ -284,7 +283,7 @@ const d3d_format_t *FindD3D11Format(ID3D11Device *d3ddevice,
     return NULL;
 }
 
-int AllocateTextures( vlc_object_t *obj, d3d11_handle_t *hd3d11,
+int AllocateTextures( vlc_object_t *obj, d3d11_device_t *hd3d11,
                       const d3d_format_t *cfg, const video_format_t *fmt,
                       unsigned pool_size, ID3D11Texture2D *textures[] )
 {
diff --git a/modules/video_chroma/d3d11_fmt.h b/modules/video_chroma/d3d11_fmt.h
index bdc886c9b6..4beb4256c7 100644
--- a/modules/video_chroma/d3d11_fmt.h
+++ b/modules/video_chroma/d3d11_fmt.h
@@ -33,7 +33,7 @@ typedef struct
 {
     ID3D11Device             *d3ddevice;       /* D3D device */
     ID3D11DeviceContext      *d3dcontext;      /* D3D context */
-} d3d11_handle_t;
+} d3d11_device_t;
 
 /* owned by the vout for VLC_CODEC_D3D11_OPAQUE */
 struct picture_sys_t
@@ -76,8 +76,7 @@ int AllocateShaderView(vlc_object_t *obj, ID3D11Device *d3ddevice,
                               ID3D11ShaderResourceView *resourceView[D3D11_MAX_SHADER_VIEW]);
 
 HRESULT D3D11_CreateDevice(vlc_object_t *obj, HINSTANCE hdecoder_dll,
-                                         bool hw_decoding,
-                                         d3d11_handle_t *p_hd3d11);
+                           bool hw_decoding, d3d11_device_t *out);
 
 bool isXboxHardware(ID3D11Device *d3ddev);
 bool isNvidiaHardware(ID3D11Device *d3ddev);
@@ -98,7 +97,7 @@ const d3d_format_t *FindD3D11Format(ID3D11Device *d3ddevice,
                                                   bool allow_opaque,
                                                   UINT supportFlags);
 
-int AllocateTextures(vlc_object_t *obj, d3d11_handle_t *hd3d11,
+int AllocateTextures(vlc_object_t *obj, d3d11_device_t *hd3d11,
                      const d3d_format_t *cfg, const video_format_t *fmt,
                      unsigned pool_size, ID3D11Texture2D *textures[]);
 
diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index 73e627ef35..3191a8eee2 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -150,7 +150,7 @@ struct vout_display_sys_t
 #endif
     IDXGISwapChain1          *dxgiswapChain;   /* DXGI 1.2 swap chain */
     IDXGISwapChain4          *dxgiswapChain4;  /* DXGI 1.5 for HDR */
-    d3d11_handle_t           hd3d11;
+    d3d11_device_t           hd3d11;
     d3d_quad_t               picQuad;
     const d3d_format_t       *picQuadConfig;
     ID3D11PixelShader        *picQuadPixelShader;
-- 
2.14.2