/*****************************************************************************
* glx.c: GLX OpenGL provider
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <errno.h> /* ENOMEM */
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_interface.h>
+#include <vlc_vout.h>
#ifdef HAVE_SYS_SHM_H
# include <sys/shm.h> /* shmget(), shmctl() */
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int CheckGLX ( vlc_object_t *, vlc_bool_t * );
static int InitGLX12 ( vout_thread_t * );
static int InitGLX13 ( vout_thread_t * );
static void SwitchContext( vout_thread_t * );
*****************************************************************************/
#define ADAPTOR_TEXT N_("XVideo adaptor number")
#define ADAPTOR_LONGTEXT N_( \
- "If you graphics card provides several adaptors, this option allows you " \
+ "If your graphics card provides several adaptors, you have " \
"to choose which one will be used (you shouldn't have to change this).")
#define ALT_FS_TEXT N_("Alternate fullscreen method")
"2) Completely bypass the window manager, but then nothing will be able " \
"to show on top of the video.")
-#define DISPLAY_TEXT N_("X11 display name")
+#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
- "Specify the X11 hardware display you want to use. By default VLC will " \
+ "X11 hardware display to use. By default VLC will " \
"use the value of the DISPLAY environment variable.")
-#define SCREEN_TEXT N_("Screen to be used for fullscreen mode.")
+#define SHM_TEXT N_("Use shared memory")
+#define SHM_LONGTEXT N_( \
+ "Use shared memory to communicate between VLC and the X server.")
+
+#define SCREEN_TEXT N_("Screen for fullscreen mode.")
#define SCREEN_LONGTEXT N_( \
- "Choose the screen you want to use in fullscreen mode. For instance " \
+ "Screen to use in fullscreen mode. For instance " \
"set it to 0 for first screen, 1 for the second.")
-vlc_module_begin();
- set_shortname( N_("OpenGL") );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VOUT );
- set_description( _("X11 OpenGL provider") );
- set_capability( "opengl provider", 50 );
- set_callbacks( CreateOpenGL, DestroyOpenGL );
-
- add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
- add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, VLC_TRUE );
- add_bool( "glx-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE );
+vlc_module_begin ()
+ set_shortname( "OpenGL(GLX)" )
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VOUT )
+ set_description( N_("OpenGL(GLX) provider") )
+ set_capability( "opengl provider", 50 )
+ set_callbacks( CreateOpenGL, DestroyOpenGL )
+
+ add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
+ add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
+ add_bool( "glx-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
+#ifdef HAVE_SYS_SHM_H
+ add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
+#endif
#ifdef HAVE_XINERAMA
- add_integer ( "glx-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, VLC_TRUE );
+ add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
#endif
-vlc_module_end();
+vlc_module_end ()
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-extern int E_(Activate) ( vlc_object_t * );
-extern void E_(Deactivate) ( vlc_object_t * );
+extern int Activate ( vlc_object_t * );
+extern void Deactivate ( vlc_object_t * );
/*****************************************************************************
* CreateOpenGL: initialize an OpenGL provider
static int CreateOpenGL( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vlc_bool_t b_glx13;
- if( CheckGLX( p_this, &b_glx13 ) != VLC_SUCCESS )
- {
- msg_Err( p_vout, "no GLX support" );
- return VLC_EGENERIC;
- }
-
- if( E_(Activate)( p_this ) != VLC_SUCCESS )
+ if( Activate( p_this ) != VLC_SUCCESS )
{
return VLC_EGENERIC;
}
/* Set the function pointer */
p_vout->pf_init = InitOpenGL;
p_vout->pf_swap = SwapBuffers;
- p_vout->p_sys->b_glx13 = b_glx13;
return VLC_SUCCESS;
}
glXDestroyWindow( p_sys->p_display, p_sys->gwnd );
}
- E_(Deactivate)( p_this );
-}
-
-/*****************************************************************************
- * OpenDisplay: open and initialize OpenGL device
- *****************************************************************************/
-static int CheckGLX( vlc_object_t *p_this, vlc_bool_t *b_glx13 )
-{
- Display *p_display = NULL;
- int i_opcode, i_evt, i_err = 0;
- int i_maj, i_min = 0;
-
- /* Open the display */
- p_display = XOpenDisplay( NULL );
- if( p_display == NULL )
- {
- msg_Err( p_this, "Cannot open display" );
- return VLC_EGENERIC;
- }
-
- /* Check for GLX extension */
- if( !XQueryExtension( p_display, "GLX", &i_opcode, &i_evt, &i_err ) )
- {
- msg_Err( p_this, "GLX extension not supported" );
- XCloseDisplay( p_display );
- return VLC_EGENERIC;
- }
- if( !glXQueryExtension( p_display, &i_err, &i_evt ) )
- {
- msg_Err( p_this, "glXQueryExtension failed" );
- XCloseDisplay( p_display );
- return VLC_EGENERIC;
- }
-
- /* Check GLX version */
- if (!glXQueryVersion( p_display, &i_maj, &i_min ) )
- {
- msg_Err( p_this, "glXQueryVersion failed" );
- XCloseDisplay( p_display );
- return VLC_EGENERIC;
- }
- if( i_maj <= 0 || ((i_maj == 1) && (i_min < 3)) )
- {
- *b_glx13 = VLC_FALSE;
- msg_Dbg( p_this, "Using GLX 1.2 API" );
- }
- else
- {
- *b_glx13 = VLC_TRUE;
- msg_Dbg( p_this, "Using GLX 1.3 API" );
- }
-
- XCloseDisplay( p_display );
- return VLC_SUCCESS;
+ Deactivate( p_this );
}
/*****************************************************************************
int InitGLX13( vout_thread_t *p_vout )
{
vout_sys_t *p_sys = p_vout->p_sys;
- int i_nbelem;
- GLXFBConfig *p_fbconfs, fbconf;
- XVisualInfo *p_vi;
- int p_attr[] = { GLX_RED_SIZE, 5, GLX_GREEN_SIZE, 5,
- GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER, True,
- GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, 0 };
+ int i_nb, ret = VLC_EGENERIC;
+ GLXFBConfig *p_fbconfs = NULL, fbconf;
+ XWindowAttributes att;
+ static const int p_attr[] = {
+ GLX_RED_SIZE, 5, GLX_GREEN_SIZE, 5, GLX_BLUE_SIZE, 5,
+ GLX_DOUBLEBUFFER, True, GLX_X_RENDERABLE, True,
+ GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+ None,
+ };
/* Get the FB configuration */
- p_fbconfs = glXChooseFBConfig( p_sys->p_display, 0, p_attr, &i_nbelem );
- if( (i_nbelem <= 0) || !p_fbconfs )
+ p_fbconfs = glXChooseFBConfig( p_sys->p_display, p_sys->i_screen, p_attr, &i_nb );
+ if( p_fbconfs == NULL )
{
msg_Err( p_vout, "Cannot get FB configurations");
- if( p_fbconfs ) XFree( p_fbconfs );
return VLC_EGENERIC;
}
- fbconf = p_fbconfs[0];
- /* Get the X11 visual */
- p_vi = glXGetVisualFromFBConfig( p_sys->p_display, fbconf );
- if( !p_vi )
+ /* We should really create the window _after_ the frame buffer
+ * configuration was chosen, instead of selecting the frame buffer from
+ * the window. That requires reworking xcommon.c though.
+ * -- Courmisch */
+ XGetWindowAttributes( p_sys->p_display, p_sys->p_win->video_window, &att );
+ for( int i = 0; i < i_nb && !fbconf; i++ )
{
- msg_Err( p_vout, "Cannot get X11 visual" );
- XFree( p_fbconfs );
- return VLC_EGENERIC;
+ XVisualInfo *p_vi;
+
+ /* Get the X11 visual */
+ p_vi = glXGetVisualFromFBConfig( p_sys->p_display, p_fbconfs[i] );
+ if( !p_vi )
+ continue; /* OoM? */
+
+ if( p_vi->visualid == att.visual->visualid )
+ fbconf = p_fbconfs[i];
+ XFree( p_vi );
+ }
+ if( !fbconf )
+ {
+ msg_Err( p_vout, "Cannot find matching frame buffer" );
+ goto out;
}
- XFree( p_vi );
/* Create the GLX window */
p_sys->gwnd = glXCreateWindow( p_sys->p_display, fbconf,
if( p_sys->gwnd == None )
{
msg_Err( p_vout, "Cannot create GLX window" );
- return VLC_EGENERIC;
+ goto out;
}
/* Create an OpenGL context */
p_sys->gwctx = glXCreateNewContext( p_sys->p_display, fbconf,
GLX_RGBA_TYPE, NULL, True );
- XFree( p_fbconfs );
if( !p_sys->gwctx )
- {
msg_Err( p_vout, "Cannot create OpenGL context");
- return VLC_EGENERIC;
- }
+ else
+ ret = VLC_SUCCESS;
- return VLC_SUCCESS;
+out:
+ XFree( p_fbconfs );
+ return ret;
}
/*****************************************************************************
static void SwapBuffers( vout_thread_t *p_vout )
{
vout_sys_t *p_sys = p_vout->p_sys;
- int i_width, i_height, i_x, i_y;
+ unsigned int i_width, i_height, i_x, i_y;
vout_PlacePicture( p_vout, p_vout->p_sys->p_win->i_width,
p_vout->p_sys->p_win->i_height,
projects / vlc / blobdiff