#include <assert.h>
#include <xcb/xcb.h>
-#include <X11/Xlib-xcb.h>
#include <GL/glx.h>
+#include <GL/glxext.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
*/
vlc_module_begin ()
set_shortname (N_("GLX"))
- set_description (N_("GLX video output (XCB)"))
+ set_description (N_("OpenGL GLX video output (XCB)"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 150)
struct vout_display_sys_t
{
Display *display; /* Xlib instance */
+ xcb_connection_t *conn; /**< XCB connection */
vout_window_t *embed; /* VLC window (when windowed) */
xcb_cursor_t cursor; /* blank cursor */
GLXContext ctx;
vlc_gl_t gl;
- vout_display_opengl_t vgl;
+ vout_display_opengl_t *vgl;
picture_pool_t *pool; /* picture pool */
};
}
/* Connect to X server */
+ xcb_connection_t *conn = xcb_connect (sys->embed->display.x11, NULL);
+ if (unlikely(xcb_connection_has_error (conn)))
+ {
+ vout_display_DeleteWindow (vd, sys->embed);
+ free (sys);
+ return VLC_EGENERIC;
+ }
+
Display *dpy = XOpenDisplay (sys->embed->display.x11);
if (dpy == NULL)
{
+ xcb_disconnect (conn);
vout_display_DeleteWindow (vd, sys->embed);
free (sys);
return VLC_EGENERIC;
}
sys->display = dpy;
+ sys->conn = conn;
sys->ctx = NULL;
- XSetEventQueueOwner (dpy, XCBOwnsEventQueue);
if (!CheckGLX (vd, dpy, &sys->v1_3))
goto error;
- xcb_connection_t *conn = XGetXCBConnection (dpy);
- assert (conn);
RegisterMouseEvents (obj, conn, sys->embed->handle.xid);
/* Find window parameters */
GLXFBConfig *confs = glXChooseFBConfig (dpy, snum, attr, &nelem);
if (confs == NULL)
{
- msg_Err (vd, "no GLX frame bufer configurations");
+ msg_Err (vd, "no GLX frame buffer configurations");
goto error;
}
sys->glwin = sys->window;
}
+ const char *glx_extensions = glXQueryExtensionsString (dpy, snum);
+
+ bool is_swap_interval_set = false;
+#ifdef GLX_SGI_swap_control
+ if (HasExtension (glx_extensions, "GLX_SGI_swap_control")) {
+ PFNGLXSWAPINTERVALSGIPROC SwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC)GetProcAddress (NULL, "glXSwapIntervalSGI");
+ if (!is_swap_interval_set && SwapIntervalSGI)
+ is_swap_interval_set = !SwapIntervalSGI (1);
+ }
+#endif
+#ifdef GLX_EXT_swap_control
+ if (HasExtension (glx_extensions, "GLX_EXT_swap_control")) {
+ PFNGLXSWAPINTERVALEXTPROC SwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC)GetProcAddress (NULL, "glXSwapIntervalEXT");
+ if (!is_swap_interval_set && SwapIntervalEXT)
+ {
+ SwapIntervalEXT (dpy, sys->glwin, 1);
+ is_swap_interval_set = true;
+ }
+ }
+#endif
+
/* Initialize common OpenGL video display */
sys->gl.lock = NULL;
sys->gl.unlock = NULL;
sys->gl.getProcAddress = GetProcAddress;
sys->gl.sys = sys;
- if (vout_display_opengl_Init (&sys->vgl, &vd->fmt, &sys->gl))
+ const vlc_fourcc_t *subpicture_chromas;
+ sys->vgl = vout_display_opengl_New (&vd->fmt, &subpicture_chromas, &sys->gl);
+ if (!sys->vgl)
{
sys->gl.sys = NULL;
goto error;
vout_display_info_t info = vd->info;
info.has_pictures_invalid = false;
info.has_event_thread = true;
+ info.subpicture_chromas = subpicture_chromas;
/* Setup vout_display_t once everything is fine */
vd->info = info;
Display *dpy = sys->display;
if (sys->gl.sys != NULL)
- vout_display_opengl_Clean (&sys->vgl);
+ vout_display_opengl_Delete (sys->vgl);
if (sys->ctx != NULL)
{
if (sys->v1_3)
glXDestroyWindow (dpy, sys->glwin);
}
+ XCloseDisplay (dpy);
/* show the default cursor */
- xcb_change_window_attributes (XGetXCBConnection (sys->display),
- sys->embed->handle.xid, XCB_CW_CURSOR,
- &(uint32_t) { XCB_CURSOR_NONE });
- xcb_flush (XGetXCBConnection (sys->display));
+ xcb_change_window_attributes (sys->conn, sys->embed->handle.xid,
+ XCB_CW_CURSOR, &(uint32_t) { XCB_CURSOR_NONE });
+ xcb_flush (sys->conn);
+ xcb_disconnect (sys->conn);
- XCloseDisplay (dpy);
vout_display_DeleteWindow (vd, sys->embed);
free (sys);
}
static void *GetProcAddress (vlc_gl_t *gl, const char *name)
{
(void)gl;
- return glXGetProcAddress ((const GLubyte *)name);
+#ifdef GLX_ARB_get_proc_address
+ return glXGetProcAddressARB ((const GLubyte *)name);
+#else
+ return NULL;
+#endif
}
/**
static picture_pool_t *Pool (vout_display_t *vd, unsigned requested_count)
{
vout_display_sys_t *sys = vd->sys;
- (void)requested_count;
if (!sys->pool)
- sys->pool = vout_display_opengl_GetPool (&sys->vgl);
+ sys->pool = vout_display_opengl_GetPool (sys->vgl, requested_count);
return sys->pool;
}
{
vout_display_sys_t *sys = vd->sys;
- vout_display_opengl_Prepare (&sys->vgl, pic);
- (void)subpicture;
+ vout_display_opengl_Prepare (sys->vgl, pic, subpicture);
}
static void PictureDisplay (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
{
vout_display_sys_t *sys = vd->sys;
- vout_display_opengl_Display (&sys->vgl, &vd->source);
+ vout_display_opengl_Display (sys->vgl, &vd->source);
picture_Release (pic);
- (void)subpicture;
+ if (subpicture)
+ subpicture_Delete(subpicture);
}
static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
{
- xcb_connection_t *conn = XGetXCBConnection (sys->display);
const vout_display_cfg_t *cfg;
const video_format_t *source;
bool is_forced = false;
const uint32_t values[] = { place.x, place.y,
place.width, place.height, };
xcb_void_cookie_t ck =
- xcb_configure_window_checked (conn, sys->window,
+ xcb_configure_window_checked (sys->conn, sys->window,
XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y
| XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT,
values);
- if (CheckError (vd, conn, "cannot resize X11 window", ck))
+ if (CheckError (vd, sys->conn, "cannot resize X11 window", ck))
return VLC_EGENERIC;
glViewport (0, 0, place.width, place.height);
/* Hide the mouse. It will be send when
* vout_display_t::info.b_hide_mouse is false */
case VOUT_DISPLAY_HIDE_MOUSE:
- xcb_change_window_attributes (XGetXCBConnection (sys->display),
- sys->embed->handle.xid,
+ xcb_change_window_attributes (sys->conn, sys->embed->handle.xid,
XCB_CW_CURSOR, &(uint32_t){ sys->cursor });
+ xcb_flush (sys->conn);
return VLC_SUCCESS;
case VOUT_DISPLAY_GET_OPENGL:
static void Manage (vout_display_t *vd)
{
vout_display_sys_t *sys = vd->sys;
- xcb_connection_t *conn = XGetXCBConnection (sys->display);
- ManageEvent (vd, conn, &sys->visible);
+ ManageEvent (vd, sys->conn, &sys->visible);
}
projects / vlc / blobdiff