[vlc-commits] d3d11: cleaner split of the (non)winstore code

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Jan  8 10:36:46 2019 +0100| [f5d0efb65c811bf12ee392f7d97a4fd318ea7b59] | committer: Steve Lhomme

d3d11: cleaner split of the (non)winstore code

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

 modules/video_chroma/d3d11_fmt.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/video_chroma/d3d11_fmt.c b/modules/video_chroma/d3d11_fmt.c
index e071b06530..752066cb04 100644
--- a/modules/video_chroma/d3d11_fmt.c
+++ b/modules/video_chroma/d3d11_fmt.c
@@ -165,16 +165,12 @@ static HKEY GetAdapterRegistry(vlc_object_t *obj, DXGI_ADAPTER_DESC *adapterDesc
     }
     return NULL;
 }
-#endif
 
 #undef D3D11_GetDriverVersion
 void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev)
 {
     memset(&d3d_dev->WDDM, 0, sizeof(d3d_dev->WDDM));
 
-#if VLC_WINSTORE_APP
-    return;
-#else
     IDXGIAdapter *pAdapter = D3D11DeviceAdapter(d3d_dev->d3ddevice);
     if (unlikely(!pAdapter))
     {
@@ -227,8 +223,13 @@ void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev)
         /* new Intel driver format */
         d3d_dev->WDDM.build += (revision - 100) * 1000;
     }
-#endif
 }
+#else /* VLC_WINSTORE_APP */
+void D3D11_GetDriverVersion(vlc_object_t *obj, d3d11_device_t *d3d_dev)
+{
+    return;
+}
+#endif /* VLC_WINSTORE_APP */
 
 void D3D11_ReleaseDevice(d3d11_device_t *d3d_dev)
 {