diff options
Diffstat (limited to 'libvo/vo_direct3d.c')
| -rw-r--r-- | libvo/vo_direct3d.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index bfeb82e562..090f48bcf8 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -70,6 +70,10 @@ static struct global_priv { the movie's codec) */ D3DFORMAT desktop_fmt; /**< Desktop (screen) colorspace format. Usually XRGB */ + + HANDLE d3d9_dll; /**< d3d9 Library HANDLE */ + IDirect3D9 * (WINAPI *pDirect3DCreate9)(UINT); /**< pointer to Direct3DCreate9 function */ + LPDIRECT3D9 d3d_handle; /**< Direct3D Handle */ LPDIRECT3DDEVICE9 d3d_device; /**< The Direct3D Adapter */ IDirect3DSurface9 *d3d_surface; /**< Offscreen Direct3D Surface. MPlayer @@ -441,7 +445,7 @@ static int reconfigure_d3d(void) IDirect3D9_Release(priv->d3d_handle); /* Initialize Direct3D from the beginning */ - priv->d3d_handle = Direct3DCreate9(D3D_SDK_VERSION); + priv->d3d_handle = priv->pDirect3DCreate9(D3D_SDK_VERSION); if (!priv->d3d_handle) { mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Initializing Direct3D failed.\n"); return 0; @@ -678,7 +682,19 @@ static int preinit(const char *arg) > an example of how to use it. */ - priv->d3d_handle = Direct3DCreate9(D3D_SDK_VERSION); + priv->d3d9_dll = LoadLibraryA("d3d9.dll"); + if (!priv->d3d9_dll) { + mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Unable to dynamically load d3d9.dll\n"); + return -1; + } + + priv->pDirect3DCreate9 = (void *)GetProcAddress(priv->d3d9_dll, "Direct3DCreate9"); + if (!priv->pDirect3DCreate9) { + mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Unable to find entry point of Direct3DCreate9\n"); + return -1; + } + + priv->d3d_handle = priv->pDirect3DCreate9(D3D_SDK_VERSION); if (!priv->d3d_handle) { mp_msg(MSGT_VO, MSGL_ERR, "<vo_direct3d>Initializing Direct3D failed.\n"); return -1; @@ -861,6 +877,7 @@ static void uninit(void) uninit_d3d(); vo_w32_uninit(); /* w32_common framework call */ + FreeLibrary(priv->d3d9_dll); free(priv); priv = NULL; } |