[vlc-commits] direct3d: make the setup callback mandatory

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May 10 11:04:22 2019 +0200| [0b0de34ef0290461048116439726a601234bdb14] | committer: Steve Lhomme

direct3d: make the setup callback mandatory

It would have been used as NULL otherwise

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

 modules/video_output/win32/direct3d11.c | 2 +-
 modules/video_output/win32/direct3d9.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c
index b67c5f8046..df8cd6b4e7 100644
--- a/modules/video_output/win32/direct3d11.c
+++ b/modules/video_output/win32/direct3d11.c
@@ -639,7 +639,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
 
     CommonInit(vd, &sys->area, cfg);
 
-    if (sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL)
+    if ( sys->setupDeviceCb == NULL || sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
     {
         /* use our internal swapchain callbacks */
         sys->internal_swapchain.obj = VLC_OBJECT(vd);
diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c
index 9eafc0b614..554b206f78 100644
--- a/modules/video_output/win32/direct3d9.c
+++ b/modules/video_output/win32/direct3d9.c
@@ -1686,7 +1686,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
     if (!sys)
         return VLC_ENOMEM;
 
-    if ( sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
+    if ( sys->setupDeviceCb == NULL || sys->swapCb == NULL || sys->startEndRenderingCb == NULL || sys->updateOutputCb == NULL )
     {
         /* use our own callbacks, since there isn't any external ones */
         sys->outside_opaque = vd;