RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_opengl: EGL: fix hwdec probing 

If ANGLE was probed before (but rejected), the ANGLE API can remain
"initialized", and eglGetCurrentDisplay() will return a non-NULL
EGLDisplay. Then if a native GL context is used, the ANGLE/EGL API will
then (apparently) keep working alongside native OpenGL API. Since GL
objects are just numbers, they'll simply fail to interact, and OpenGL
will get invalid textures. For some reason this will result in black
textures.

With VAAPI-EGL, something similar could happen in theory, but didn't in
practice.
This commit is contained in:
wm4 2016-05-05 13:38:08 +02:00
parent e5e1088c92
commit f56555b514
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
video/out/opengl/hwdec_d3d11egl.c
View File

@ -116,6 +116,9 @@ static int create(struct gl_hwdec *hw)
if (!egl_display)
return -1;
if (!eglGetCurrentContext())
return -1;
const char *exts = eglQueryString(egl_display, EGL_EXTENSIONS);
if (!exts || !strstr(exts, "EGL_ANGLE_d3d_share_handle_client_buffer") ||
!strstr(exts, "EGL_EXT_device_query"))

3
video/out/opengl/hwdec_dxva2egl.c
View File

@ -99,6 +99,9 @@ static int create(struct gl_hwdec *hw)
if (!egl_display)
return -1;
if (!eglGetCurrentContext())
return -1;
const char *exts = eglQueryString(egl_display, EGL_EXTENSIONS);
if (!exts ||
!strstr(exts, "EGL_ANGLE_d3d_share_handle_client_buffer")) {

2
video/out/opengl/hwdec_vaegl.c
View File

@ -183,7 +183,7 @@ static int create(struct gl_hwdec *hw)
if (hw->hwctx)
return -1;
if (!eglGetCurrentDisplay())
if (!eglGetCurrentContext())
return -1;
const char *exts = eglQueryString(eglGetCurrentDisplay(), EGL_EXTENSIONS);