[vlc-commits] direct3d9: make d3d9_handle_t functions private

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Wed Feb 12 13:15:09 2020 +0100| [9cbfb5d6df9682855c7e85ba158b4fb133bf5d7b] | committer: Steve Lhomme

direct3d9: make d3d9_handle_t functions private

They are only called locally.

No functional change.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9cbfb5d6df9682855c7e85ba158b4fb133bf5d7b
---

 modules/video_chroma/d3d9_fmt.c | 147 ++++++++++++++++++++--------------------
 modules/video_chroma/d3d9_fmt.h |   6 --
 2 files changed, 73 insertions(+), 80 deletions(-)

diff --git a/modules/video_chroma/d3d9_fmt.c b/modules/video_chroma/d3d9_fmt.c
index ef08f2aaa1..2ae8ce8db8 100644
--- a/modules/video_chroma/d3d9_fmt.c
+++ b/modules/video_chroma/d3d9_fmt.c
@@ -52,6 +52,79 @@ typedef struct {
     d3d9_decoder_device_t           dec_device;
 } d3d9_decoder_device;
 
+static void D3D9_Destroy(d3d9_handle_t *hd3d)
+{
+    if (hd3d->obj)
+    {
+       IDirect3D9_Release(hd3d->obj);
+       hd3d->obj = NULL;
+    }
+    if (hd3d->hdll)
+    {
+        FreeLibrary(hd3d->hdll);
+        hd3d->hdll = NULL;
+    }
+}
+
+/**
+ * It initializes an instance of Direct3D9
+ */
+static int D3D9_Create(vlc_object_t *o, d3d9_handle_t *hd3d)
+{
+    hd3d->hdll = LoadLibrary(TEXT("D3D9.DLL"));
+    if (!hd3d->hdll) {
+        msg_Warn(o, "cannot load d3d9.dll, aborting");
+        return VLC_EGENERIC;
+    }
+
+    IDirect3D9 *(WINAPI *OurDirect3DCreate9)(UINT SDKVersion);
+    OurDirect3DCreate9 =
+        (void *)GetProcAddress(hd3d->hdll, "Direct3DCreate9");
+    if (!OurDirect3DCreate9) {
+        msg_Err(o, "Cannot locate reference to Direct3DCreate9 ABI in DLL");
+        goto error;
+    }
+
+    HRESULT (WINAPI *OurDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **ppD3D);
+    OurDirect3DCreate9Ex =
+        (void *)GetProcAddress(hd3d->hdll, "Direct3DCreate9Ex");
+
+    /* Create the D3D object. */
+    hd3d->use_ex = false;
+    if (OurDirect3DCreate9Ex) {
+        HRESULT hr = OurDirect3DCreate9Ex(D3D_SDK_VERSION, &hd3d->objex);
+        if(!FAILED(hr)) {
+            msg_Dbg(o, "Using Direct3D9 Extended API!");
+            hd3d->use_ex = true;
+        }
+    }
+
+    if (!hd3d->obj)
+    {
+        hd3d->obj = OurDirect3DCreate9(D3D_SDK_VERSION);
+        if (!hd3d->obj) {
+            msg_Err(o, "Could not create Direct3D9 instance.");
+            goto error;
+        }
+    }
+    return VLC_SUCCESS;
+error:
+    D3D9_Destroy( hd3d );
+    return VLC_EGENERIC;
+}
+
+static void D3D9_CloneExternal(d3d9_handle_t *hd3d, IDirect3D9 *dev)
+{
+    hd3d->obj = dev;
+    IDirect3D9_AddRef( hd3d->obj );
+    hd3d->hdll = NULL;
+
+    void *pv = NULL;
+    hd3d->use_ex = SUCCEEDED(IDirect3D9_QueryInterface(dev, &IID_IDirect3D9Ex, &pv));
+    if (hd3d->use_ex && pv)
+        IDirect3D9Ex_Release((IDirect3D9Ex*) pv);
+}
+
 d3d9_decoder_device_t *(D3D9_CreateDevice)(vlc_object_t *o)
 {
     HRESULT hr;
@@ -232,80 +305,6 @@ int D3D9_FillPresentationParameters(const d3d9_decoder_device_t *dec_dev,
     return VLC_SUCCESS;
 }
 
-void D3D9_Destroy(d3d9_handle_t *hd3d)
-{
-    if (hd3d->obj)
-    {
-       IDirect3D9_Release(hd3d->obj);
-       hd3d->obj = NULL;
-    }
-    if (hd3d->hdll)
-    {
-        FreeLibrary(hd3d->hdll);
-        hd3d->hdll = NULL;
-    }
-}
-
-/**
- * It initializes an instance of Direct3D9
- */
-#undef D3D9_Create
-int D3D9_Create(vlc_object_t *o, d3d9_handle_t *hd3d)
-{
-    hd3d->hdll = LoadLibrary(TEXT("D3D9.DLL"));
-    if (!hd3d->hdll) {
-        msg_Warn(o, "cannot load d3d9.dll, aborting");
-        return VLC_EGENERIC;
-    }
-
-    IDirect3D9 *(WINAPI *OurDirect3DCreate9)(UINT SDKVersion);
-    OurDirect3DCreate9 =
-        (void *)GetProcAddress(hd3d->hdll, "Direct3DCreate9");
-    if (!OurDirect3DCreate9) {
-        msg_Err(o, "Cannot locate reference to Direct3DCreate9 ABI in DLL");
-        goto error;
-    }
-
-    HRESULT (WINAPI *OurDirect3DCreate9Ex)(UINT SDKVersion, IDirect3D9Ex **ppD3D);
-    OurDirect3DCreate9Ex =
-        (void *)GetProcAddress(hd3d->hdll, "Direct3DCreate9Ex");
-
-    /* Create the D3D object. */
-    hd3d->use_ex = false;
-    if (OurDirect3DCreate9Ex) {
-        HRESULT hr = OurDirect3DCreate9Ex(D3D_SDK_VERSION, &hd3d->objex);
-        if(!FAILED(hr)) {
-            msg_Dbg(o, "Using Direct3D9 Extended API!");
-            hd3d->use_ex = true;
-        }
-    }
-
-    if (!hd3d->obj)
-    {
-        hd3d->obj = OurDirect3DCreate9(D3D_SDK_VERSION);
-        if (!hd3d->obj) {
-            msg_Err(o, "Could not create Direct3D9 instance.");
-            goto error;
-        }
-    }
-    return VLC_SUCCESS;
-error:
-    D3D9_Destroy( hd3d );
-    return VLC_EGENERIC;
-}
-
-void D3D9_CloneExternal(d3d9_handle_t *hd3d, IDirect3D9 *dev)
-{
-    hd3d->obj = dev;
-    IDirect3D9_AddRef( hd3d->obj );
-    hd3d->hdll = NULL;
-
-    void *pv = NULL;
-    hd3d->use_ex = SUCCEEDED(IDirect3D9_QueryInterface(dev, &IID_IDirect3D9Ex, &pv));
-    if (hd3d->use_ex && pv)
-        IDirect3D9Ex_Release((IDirect3D9Ex*) pv);
-}
-
 const struct vlc_video_context_operations d3d9_vctx_ops = {
     NULL,
 };
diff --git a/modules/video_chroma/d3d9_fmt.h b/modules/video_chroma/d3d9_fmt.h
index 45ced1306c..362d3ae311 100644
--- a/modules/video_chroma/d3d9_fmt.h
+++ b/modules/video_chroma/d3d9_fmt.h
@@ -56,7 +56,6 @@ typedef struct
 
 typedef struct
 {
-    /* d3d9_handle_t           hd3d; TODO */
     union
     {
         IDirect3DDevice9    *dev;
@@ -137,11 +136,6 @@ d3d9_decoder_device_t *D3D9_CreateDevice(vlc_object_t *);
 #define D3D9_CreateDevice(a) D3D9_CreateDevice( VLC_OBJECT(a) )
 
 void D3D9_ReleaseDevice(d3d9_decoder_device_t *);
-int D3D9_Create(vlc_object_t *, d3d9_handle_t *);
-#define D3D9_Create(a,b) D3D9_Create( VLC_OBJECT(a), b )
-void D3D9_CloneExternal(d3d9_handle_t *, IDirect3D9 *);
-
-void D3D9_Destroy(d3d9_handle_t *);
 
 int D3D9_FillPresentationParameters(const d3d9_decoder_device_t *, D3DPRESENT_PARAMETERS *);