diff options
author | James Ross-Gowan <rossymiles@gmail.com> | 2015-11-24 20:14:04 +1100 |
---|---|---|
committer | James Ross-Gowan <rossymiles@gmail.com> | 2015-11-26 00:35:48 +1100 |
commit | dab2e909afffd3ed479e652931d13935d5908af5 (patch) | |
tree | a192fa71f3c8ceed3cde3d4e5f0cb96edefd7c25 /video | |
parent | 06df54a111c6a4b4ed3f682c8a5e82c11a70a80f (diff) | |
download | mpv-dab2e909afffd3ed479e652931d13935d5908af5.tar.bz2 mpv-dab2e909afffd3ed479e652931d13935d5908af5.tar.xz |
vo_opengl: angle: don't load libGLESv2.dll
ANGLE has EGL_KHR_get_all_proc_addresses, so all GLES core functions can
be queried with eglGetProcAddress.
Diffstat (limited to 'video')
-rw-r--r-- | video/out/opengl/angle.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/video/out/opengl/angle.c b/video/out/opengl/angle.c index 49af515a39..d660f82762 100644 --- a/video/out/opengl/angle.c +++ b/video/out/opengl/angle.c @@ -32,7 +32,6 @@ struct priv { EGLDisplay egl_display; EGLContext egl_context; EGLSurface egl_surface; - HMODULE libglesv2; }; static void angle_uninit(MPGLContext *ctx) @@ -45,10 +44,6 @@ static void angle_uninit(MPGLContext *ctx) eglDestroyContext(p->egl_display, p->egl_context); } p->egl_context = EGL_NO_CONTEXT; - - if (p->libglesv2) - FreeLibrary(p->libglesv2); - vo_w32_uninit(ctx->vo); } @@ -102,12 +97,7 @@ static bool create_context_egl(MPGLContext *ctx, EGLConfig config, int version) static void *get_proc_address(const GLubyte *proc_name) { - void *res = eglGetProcAddress(proc_name); - if (res) - return res; - - // ANGLE's eglGetProcAddress only works for extensions - return GetProcAddress(GetModuleHandleW(L"libGLESv2.dll"), proc_name); + return eglGetProcAddress(proc_name); } static int angle_init(struct MPGLContext *ctx, int flags) @@ -118,12 +108,6 @@ static int angle_init(struct MPGLContext *ctx, int flags) if (!vo_w32_init(vo)) goto fail; - p->libglesv2 = LoadLibraryW(L"libGLESv2.dll"); - if (!p->libglesv2) { - MP_FATAL(vo, "Couldn't load GLES functions\n"); - goto fail; - } - HDC dc = GetDC(vo_w32_hwnd(vo)); if (!dc) { MP_FATAL(vo, "Couldn't get DC\n"); |