1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-19 21:31:52 +00:00

vo_opengl: minimal EGL on X11 support

Pretty useless and only good for testing.

Does not include any form of GLES support.
This commit is contained in:
wm4 2014-11-04 00:12:04 +01:00
parent dc1d851c92
commit bebfaae666
7 changed files with 188 additions and 1 deletions

View File

@ -628,12 +628,13 @@ check_yes_no $_dvbin DVBIN
check_statement_libs "JPEG support" $_jpeg JPEG "stdio.h jpeglib.h" "" "-ljpeg $_ld_lm"
_gl_x11_egl=no
(test "$_x11" = no && test "$_wayland" = no) && _gl=no
echocheck "OpenGL"
#Note: this test is run even with --enable-gl since we autodetect linker flags
if test "$_gl" != no ; then
cat > $TMPC << EOF
#if defined(GL_WAYLAND)
#if defined(GL_WAYLAND) || defined(EGL_X11)
#include <EGL/egl.h>
#else
#include <X11/Xlib.h>
@ -670,6 +671,10 @@ EOF
libs_mplayer="$libs_mplayer -lGL -lEGL"
test "$_gl_wayland" = yes && res_comment="$res_comment wayland"
fi
if test "$_x11" = yes && test "$_gl" = yes && pkg_config_add "egl"; then
_gl_x11_egl=yes
res_comment="$res_comment x11egl"
fi
else
_gl=no
fi
@ -677,9 +682,11 @@ fi
if test "$_gl" = no ; then
_gl_x11=no
_gl_wayland=no
_gl_x11_egl=no
fi
check_yes_no $_gl GL
check_yes_no $_gl_x11 GL_X11
check_yes_no $_gl_x11_egl EGL_X11
check_yes_no $_gl_wayland GL_WAYLAND
echores "$_gl"

View File

@ -70,6 +70,7 @@ SOURCES-$(ENCODING) += video/out/vo_lavc.c audio/out/ao_lavc.c \
common/encode_lavc.c
SOURCES-$(GL_X11) += video/out/x11_common.c video/out/gl_x11.c
SOURCES-$(EGL_X11) += video/out/x11_common.c video/out/gl_x11egl.c
SOURCES-$(GL_WAYLAND) += video/out/wayland_common.c \
video/out/gl_wayland.c

View File

@ -879,6 +879,9 @@ static const struct backend backends[] = {
#endif
#if HAVE_GL_X11
{"x11", mpgl_set_backend_x11},
#endif
#if HAVE_EGL_X11
{"x11egl", mpgl_set_backend_x11egl},
#endif
{0}
};

View File

@ -161,6 +161,7 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
void mpgl_set_backend_cocoa(MPGLContext *ctx);
void mpgl_set_backend_w32(MPGLContext *ctx);
void mpgl_set_backend_x11(MPGLContext *ctx);
void mpgl_set_backend_x11egl(MPGLContext *ctx);
void mpgl_set_backend_wayland(MPGLContext *ctx);
struct mp_hwdec_info;

167
video/out/gl_x11egl.c Normal file
View File

@ -0,0 +1,167 @@
/*
* This file is part of mpv.
*
* mpv is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* mpv is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with mpv. If not, see <http://www.gnu.org/licenses/>.
*
* You can alternatively redistribute this file and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*/
#include <X11/Xlib.h>
#include <EGL/egl.h>
#include <EGL/eglext.h>
#include "common/common.h"
#include "x11_common.h"
#include "gl_common.h"
struct priv {
EGLDisplay egl_display;
EGLContext egl_context;
EGLSurface egl_surface;
};
static EGLConfig select_fb_config_egl(struct MPGLContext *ctx)
{
struct priv *p = ctx->priv;
EGLint attributes[] = {
EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8,
EGL_DEPTH_SIZE, 0,
EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT,
EGL_NONE
};
EGLint config_count;
EGLConfig config;
eglChooseConfig(p->egl_display, attributes, &config, 1, &config_count);
if (!config_count) {
MP_FATAL(ctx->vo, "Could find EGL configuration!\n");
return NULL;
}
return config;
}
static bool create_context_egl(MPGLContext *ctx, EGLConfig config,
EGLNativeWindowType window)
{
struct priv *p = ctx->priv;
EGLint context_attributes[] = {
EGL_CONTEXT_MAJOR_VERSION_KHR,
MPGL_VER_GET_MAJOR(ctx->requested_gl_version),
EGL_NONE
};
p->egl_surface = eglCreateWindowSurface(p->egl_display, config, window, NULL);
if (p->egl_surface == EGL_NO_SURFACE) {
MP_FATAL(ctx->vo, "Could not create EGL surface!\n");
return false;
}
p->egl_context = eglCreateContext(p->egl_display, config,
EGL_NO_CONTEXT, context_attributes);
if (p->egl_context == EGL_NO_CONTEXT) {
MP_FATAL(ctx->vo, "Could not create EGL context!\n");
return false;
}
eglMakeCurrent(p->egl_display, p->egl_surface, p->egl_surface,
p->egl_context);
return true;
}
static bool config_window_x11_egl(struct MPGLContext *ctx, int flags)
{
struct priv *p = ctx->priv;
struct vo *vo = ctx->vo;
if (p->egl_context) {
vo_x11_config_vo_window(vo, NULL, flags, "gl");
return true;
}
eglBindAPI(EGL_OPENGL_API);
p->egl_display = eglGetDisplay(vo->x11->display);
eglInitialize(p->egl_display, NULL, NULL);
EGLConfig config = select_fb_config_egl(ctx);
if (!config)
return false;
int vID, n;
eglGetConfigAttrib(p->egl_display, config, EGL_NATIVE_VISUAL_ID, &vID);
XVisualInfo template = {.visualid = vID};
XVisualInfo *vi = XGetVisualInfo(vo->x11->display, VisualIDMask, &template, &n);
if (!vi) {
MP_FATAL(ctx->vo, "Getting X visual failed!\n");
return false;
}
vo_x11_config_vo_window(vo, vi, flags, "gl");
XFree(vi);
if (!create_context_egl(ctx, config, (EGLNativeWindowType)vo->x11->window))
{
vo_x11_uninit(ctx->vo);
return false;
}
void *(*gpa)(const GLubyte*) = (void *(*)(const GLubyte*))eglGetProcAddress;
mpgl_load_functions(ctx->gl, gpa, NULL, vo->log);
return true;
}
static void releaseGlContext_egl(MPGLContext *ctx)
{
struct priv *p = ctx->priv;
if (p->egl_context) {
eglMakeCurrent(p->egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE,
EGL_NO_CONTEXT);
eglDestroyContext(p->egl_display, p->egl_context);
}
p->egl_context = EGL_NO_CONTEXT;
}
static void swapGlBuffers_egl(MPGLContext *ctx)
{
struct priv *p = ctx->priv;
eglSwapBuffers(p->egl_display, p->egl_surface);
}
void mpgl_set_backend_x11egl(MPGLContext *ctx)
{
ctx->priv = talloc_zero(ctx, struct priv);
ctx->config_window = config_window_x11_egl;
ctx->releaseGlContext = releaseGlContext_egl;
ctx->swapGlBuffers = swapGlBuffers_egl;
ctx->vo_init = vo_x11_init;
ctx->vo_uninit = vo_x11_uninit;
ctx->vo_control = vo_x11_control;
}

View File

@ -613,6 +613,13 @@ video_output_features = [
'func': check_libs(['GL', 'GL Xdamage'],
check_cc(fragment=load_fragment('gl_x11.c'),
use=['x11', 'libdl', 'pthreads']))
} , {
'name': '--egl-x11',
'desc': 'OpenGL X11 EGL Backend',
'deps': [ 'x11' ],
'groups': [ 'gl' ],
'func': check_pkg_config('egl', 'gl'),
'default': 'disable',
} , {
'name': '--gl-wayland',
'desc': 'OpenGL Wayland Backend',

View File

@ -352,6 +352,7 @@ def build(ctx):
( "video/out/gl_w32.c", "gl-win32" ),
( "video/out/gl_wayland.c", "gl-wayland" ),
( "video/out/gl_x11.c", "gl-x11" ),
( "video/out/gl_x11egl.c", "egl-x11" ),
( "video/out/pnm_loader.c", "gl" ),
( "video/out/vo.c" ),
( "video/out/vo_caca.c", "caca" ),