diff options
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/opengl/common.c | 10 | ||||
-rw-r--r-- | video/out/opengl/common.h | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_dxva2.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c index 6720e13f2a..2b6d3949ef 100644 --- a/video/out/opengl/common.c +++ b/video/out/opengl/common.c @@ -291,9 +291,17 @@ static const struct gl_functions gl_functions[] = { // These don't exist - they are for the sake of mpv internals, and libmpv // interaction (see libmpv/opengl_cb.h). { + .extension = "GL_MP_MPGetNativeDisplay", + .functions = (const struct gl_function[]) { + DEF_FN(MPGetNativeDisplay), + {0} + }, + }, + // Same, but using the old name. + { .extension = "GL_MP_D3D_interfaces", .functions = (const struct gl_function[]) { - DEF_FN(MPGetD3DInterface), + DEF_FN_NAME(MPGetNativeDisplay, "glMPGetD3DInterface"), {0} }, }, diff --git a/video/out/opengl/common.h b/video/out/opengl/common.h index 083e2ca023..0e3566d689 100644 --- a/video/out/opengl/common.h +++ b/video/out/opengl/common.h @@ -271,7 +271,7 @@ struct GL { void (GLAPIENTRY *DebugMessageCallback)(MP_GLDEBUGPROC callback, const void *userParam); - void *(GLAPIENTRY *MPGetD3DInterface)(const char *name); + void *(GLAPIENTRY *MPGetNativeDisplay)(const char *name); }; #endif /* MPLAYER_GL_COMMON_H */ diff --git a/video/out/opengl/hwdec_dxva2.c b/video/out/opengl/hwdec_dxva2.c index f6b3ac0e74..aba442b653 100644 --- a/video/out/opengl/hwdec_dxva2.c +++ b/video/out/opengl/hwdec_dxva2.c @@ -23,13 +23,13 @@ static void destroy(struct gl_hwdec *hw) static int create(struct gl_hwdec *hw) { GL *gl = hw->gl; - if (hw->hwctx || !gl->MPGetD3DInterface) + if (hw->hwctx || !gl->MPGetNativeDisplay) return -1; struct priv *p = talloc_zero(hw, struct priv); hw->priv = p; - p->ctx.d3d9_device = gl->MPGetD3DInterface("IDirect3DDevice9"); + p->ctx.d3d9_device = gl->MPGetNativeDisplay("IDirect3DDevice9"); if (!p->ctx.d3d9_device) return -1; |