diff options
| author | wm4 <wm4@nowhere> | 2016-06-28 20:04:16 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-06-28 20:07:56 +0200 |
| commit | 17c5738cb43382831407400312f0f0d4989d115c (patch) | |
| tree | b82531fa0f5925b01353d34d23ba78a420fc4f34 /video/out/opengl/hwdec_d3d11eglrgb.c | |
| parent | d5615102d5bce7c506279a2578a34da25f91301f (diff) | |
| download | mpv-17c5738cb43382831407400312f0f0d4989d115c.tar.bz2 mpv-17c5738cb43382831407400312f0f0d4989d115c.tar.xz | |
d3d: merge angle_common.h into d3d.h
OK, this was dumb. The file didn't have much to do with ANGLE, and the
functionality can simply be moved to d3d.c. That file contains helpers
for decoding, but can always be present (on Windows) since it doesn't
access any D3D specific libavcodec APIs. Thus it doesn't need to be
conditionally built like the actual hwaccel wrappers.
Diffstat (limited to 'video/out/opengl/hwdec_d3d11eglrgb.c')
| -rw-r--r-- | video/out/opengl/hwdec_d3d11eglrgb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/video/out/opengl/hwdec_d3d11eglrgb.c b/video/out/opengl/hwdec_d3d11eglrgb.c index 2e61189154..be8057cde3 100644 --- a/video/out/opengl/hwdec_d3d11eglrgb.c +++ b/video/out/opengl/hwdec_d3d11eglrgb.c @@ -23,7 +23,6 @@ #include <EGL/egl.h> #include <EGL/eglext.h> -#include "angle_common.h" #include "angle_dynamic.h" #include "common/common.h" @@ -31,6 +30,7 @@ #include "osdep/windows_utils.h" #include "hwdec.h" #include "video/hwdec.h" +#include "video/decode/d3d.h" #ifndef EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE #define EGL_D3D_TEXTURE_SUBRESOURCE_ID_ANGLE 0x3AAB @@ -87,6 +87,8 @@ static int create(struct gl_hwdec *hw) if (!angle_load()) return -1; + d3d_load_dlls(); + EGLDisplay egl_display = eglGetCurrentDisplay(); if (!egl_display) return -1; @@ -104,7 +106,6 @@ static int create(struct gl_hwdec *hw) p->egl_display = egl_display; - HANDLE d3d11_dll = GetModuleHandleW(L"d3d11.dll"); if (!d3d11_dll) { if (!hw->probing) MP_ERR(hw, "Failed to load D3D11 library\n"); |