Commit bb13e227 authored by Gildas Bazin's avatar Gildas Bazin

* modules/video_output/x11/*: the glx "opengl provider" makes use of xcommon.c.

* modules/video_output/opengl.c: new platform independant OpenGL vout (uses an "opengl provider" module).
* modules/visualization/galaktos/*: uses the new "opengl provider" module.
parent 6129f1ce
......@@ -2414,6 +2414,24 @@ if test "${enable_xvideo}" != "no" &&
CPPFLAGS="${CPPFLAGS_save}")
fi
dnl
dnl GLX module
dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(glx,
[ --enable-glx X11 OpenGL (GLX) support (default enabled)])
if test "${enable_glx}" != "no" &&
(test "${SYS}" != "mingw32" || test "${enable_glx}" = "yes"); then
CPPFLAGS="${CPPFLAGS_save} -I${x_includes}"
AC_CHECK_HEADERS(X11/Xlib.h, [
AC_CHECK_HEADERS(GL/glx.h, [
VLC_ADD_PLUGINS([glx])
VLC_ADD_LDFLAGS([glx],[-L${x_libraries} -lX11 -lXext -lGL -lGLU])
VLC_ADD_CPPFLAGS([glx],[-I${x_includes}])
]) ])
CPPFLAGS="${CPPFLAGS_save}"
fi
dnl
dnl Check for the Xinerama extension
dnl
......@@ -2426,11 +2444,13 @@ if test "${enable_xvideo}" != "no" &&
AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[
VLC_ADD_LDFLAGS([xvideo],[-lXinerama_pic])
VLC_ADD_LDFLAGS([x11],[-lXinerama_pic])
VLC_ADD_LDFLAGS([glx],[-lXinerama_pic])
ac_cv_have_xinerama="yes"
],[
AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
VLC_ADD_LDFLAGS([xvideo],[-lXinerama])
VLC_ADD_LDFLAGS([x11],[-lXinerama])
VLC_ADD_LDFLAGS([glx],[-lXinerama])
ac_cv_have_xinerama="yes"
])
])
......@@ -2442,6 +2462,20 @@ if test "${enable_xvideo}" != "no" &&
CPPFLAGS="${CPPFLAGS_save}"
fi
dnl
dnl GLX module
dnl (enabled by default except on win32)
dnl
AC_ARG_ENABLE(opengl,
[ --enable-opengl OpenGL support (default enabled)])
if test "${enable_opengl}" != "no"; then
AC_CHECK_HEADERS(GL/gl.h, [
VLC_ADD_PLUGINS([opengl])
VLC_ADD_LDFLAGS([opengl],[-L${x_libraries} -lGL -lGLU])
])
CPPFLAGS="${CPPFLAGS_save}"
fi
dnl
dnl SDL module
dnl
......@@ -2754,18 +2788,6 @@ then
fi ])
fi
dnl
dnl GLX module
dnl
AC_ARG_ENABLE(glx,
[ --enable-glx X11 OpenGL (GLX) support (default disabled)])
if test "${enable_glx}" = "yes"
then
VLC_ADD_PLUGINS([glx])
VLC_ADD_LDFLAGS([glx],[-lGL -lGLU])
fi
dnl
dnl AA plugin
dnl
......
......@@ -102,6 +102,7 @@ struct vout_thread_t
int ( *pf_manage ) ( vout_thread_t * );
void ( *pf_render ) ( vout_thread_t *, picture_t * );
void ( *pf_display ) ( vout_thread_t *, picture_t * );
void ( *pf_swap ) ( vout_thread_t * ); /* OpenGL only */
int ( *pf_control ) ( vout_thread_t *, int, va_list );
/**@}*/
......
/*****************************************************************************
* vlc_opengl.h: OpenGL provider interface
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id$
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
* This program 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.
*
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#ifndef _VLC_OPENGL_H
#define _VLC_OPENGL_H 1
struct opengl_t
{
VLC_COMMON_MEMBERS
int i_width; /* window width */
int i_height; /* window height */
int b_fullscreen; /* fullscreen flag */
opengl_sys_t *p_sys; /* private data */
/* Create an OpenGL window of the requested size (if possible) */
int ( *pf_init )( opengl_t *, int i_width, int i_height );
/* Swap front/back buffers */
void ( *pf_swap )( opengl_t * );
/* Handle window events */
int ( *pf_handle_events )( opengl_t * );
};
#endif
......@@ -9,3 +9,4 @@ SOURCES_wingdi = wingdi.c
SOURCES_mga = mga.c
SOURCES_hd1000v = hd1000v.cpp
SOURCES_snapshot = snapshot.c
SOURCES_opengl = opengl.c
/*****************************************************************************
* opengl.c: OpenGL video output
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id$
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
*
* This program 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.
*
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <errno.h> /* ENOMEM */
#include <stdlib.h> /* malloc(), free() */
#include <string.h>
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include <GL/gl.h>
/* RV16 */
//#define VLCGL_RGB_FORMAT GL_RGB
//#define VLCGL_RGB_TYPE GL_UNSIGNED_SHORT_5_6_5
/* RV24 */
//#define VLCGL_RGB_FORMAT GL_RGB
//#define VLCGL_RGB_TYPE GL_UNSIGNED_BYTE
/* RV32 */
#define VLCGL_RGB_FORMAT GL_RGBA
#define VLCGL_RGB_TYPE GL_UNSIGNED_BYTE
/*****************************************************************************
* Vout interface
*****************************************************************************/
static int CreateVout ( vlc_object_t * );
static void DestroyVout ( vlc_object_t * );
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static void Render ( vout_thread_t *p_vout, picture_t *p_pic );
static void DisplayVideo ( vout_thread_t *, picture_t * );
static inline int GetAlignedSize( int i_size );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("OpenGL video output") );
set_capability( "video output", 20 );
add_shortcut( "opengl" );
set_callbacks( CreateVout, DestroyVout );
vlc_module_end();
/*****************************************************************************
* vout_sys_t: video output method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the OpenGL specific properties of the output thread.
*****************************************************************************/
struct vout_sys_t
{
vout_thread_t *p_vout;
uint8_t *p_buffer;
int i_index;
int i_tex_width;
int i_tex_height;
GLuint texture;
int i_effect; //XXX
};
/*****************************************************************************
* CreateVout: This function allocates and initializes the OpenGL vout method.
*****************************************************************************/
static int CreateVout( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_sys_t *p_sys;
/* Allocate structure */
p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) );
if( p_sys == NULL )
{
msg_Err( p_vout, "out of memory" );
return VLC_EGENERIC;
}
//XXX set to 0 to disable the cube effect
p_sys->i_effect = 1;
/* A texture must have a size aligned on a power of 2 */
p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width );
p_sys->i_tex_height = GetAlignedSize( p_vout->render.i_height );
msg_Dbg( p_vout, "Texture size: %dx%d", p_sys->i_tex_width,
p_sys->i_tex_height );
/* Get window */
p_sys->p_vout =
(vout_thread_t *)vlc_object_create( p_this, VLC_OBJECT_OPENGL );
if( p_sys->p_vout == NULL )
{
msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
}
p_sys->p_vout->i_window_width = p_vout->i_window_width;
p_sys->p_vout->i_window_height = p_vout->i_window_height;
p_sys->p_vout->b_fullscreen = p_vout->b_fullscreen;
p_sys->p_vout->p_module =
module_Need( p_sys->p_vout, "opengl provider", NULL, 0 );
if( p_sys->p_vout->p_module == NULL )
{
msg_Err( p_vout, "No OpenGL provider found" );
vlc_object_destroy( p_sys->p_vout );
return VLC_ENOOBJ;
}
vlc_object_attach( p_sys->p_vout, p_this );
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_render = Render;
p_vout->pf_display = DisplayVideo;
return VLC_SUCCESS;
}
/*****************************************************************************
* Init: initialize the OpenGL video thread output method
*****************************************************************************/
static int Init( vout_thread_t *p_vout )
{
vout_sys_t *p_sys = p_vout->p_sys;
int i_pixel_pitch;
/* No YUV textures :( */
#if VLCGL_RGB_FORMAT == GL_RGB
# if VLCGL_RGB_TYPE == GL_UNSIGNED_BYTE
p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4');
p_vout->output.i_rmask = 0x000000ff;
p_vout->output.i_gmask = 0x0000ff00;
p_vout->output.i_bmask = 0x00ff0000;
i_pixel_pitch = 3;
# else
p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6');
p_vout->output.i_rmask = 0xf800;
p_vout->output.i_gmask = 0x07e0;
p_vout->output.i_bmask = 0x001f;
i_pixel_pitch = 2;
# endif
#else
p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2');
p_vout->output.i_rmask = 0x000000ff;
p_vout->output.i_gmask = 0x0000ff00;
p_vout->output.i_bmask = 0x00ff0000;
i_pixel_pitch = 4;
#endif
/* Since OpenGL can do rescaling for us, stick to the default
* coordinates and aspect. */
p_vout->output.i_width = p_vout->render.i_width;
p_vout->output.i_height = p_vout->render.i_height;
p_vout->output.i_aspect = p_vout->render.i_aspect;
/* We know the chroma, allocate a buffer which will be used
* directly by the decoder */
p_vout->p_picture[0].i_planes = 1;
p_sys->p_buffer =
malloc( p_sys->i_tex_width * p_sys->i_tex_height * i_pixel_pitch );
if( !p_sys->p_buffer )
{
msg_Err( p_vout, "Out of memory" );
return -1;
}
p_vout->p_picture[0].p->p_pixels = p_sys->p_buffer;
p_vout->p_picture[0].p->i_lines = p_vout->output.i_height;
p_vout->p_picture[0].p->i_pixel_pitch = i_pixel_pitch;
p_vout->p_picture[0].p->i_pitch = p_sys->i_tex_width *
p_vout->p_picture[0].p->i_pixel_pitch;
p_vout->p_picture[0].p->i_visible_pitch = p_vout->output.i_width *
p_vout->p_picture[0].p->i_pixel_pitch;
p_vout->p_picture[0].i_status = DESTROYED_PICTURE;
p_vout->p_picture[0].i_type = DIRECT_PICTURE;
PP_OUTPUTPICTURE[ 0 ] = &p_vout->p_picture[0];
I_OUTPUTPICTURES = 1;
/* Set the texture parameters */
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
if( p_sys->i_effect )
{
glEnable( GL_CULL_FACE);
/* glDisable( GL_DEPTH_TEST );
glEnable( GL_BLEND );
glBlendFunc( GL_SRC_ALPHA, GL_ONE );*/
/* Set the perpective */
glMatrixMode( GL_PROJECTION );
glLoadIdentity();
glFrustum( -1.0, 1.0, -1.0, 1.0, 3.0, 20.0 );
glMatrixMode( GL_MODELVIEW );
glLoadIdentity();
glTranslatef( 0.0, 0.0, - 5.0 );
}
return 0;
}
/*****************************************************************************
* End: terminate GLX video thread output method
*****************************************************************************/
static void End( vout_thread_t *p_vout )
{
glFinish();
glFlush();
}
/*****************************************************************************
* Destroy: destroy GLX video thread output method
*****************************************************************************
* Terminate an output method created by CreateVout
*****************************************************************************/
static void DestroyVout( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_sys_t *p_sys = p_vout->p_sys;
module_Unneed( p_sys->p_vout, p_sys->p_vout->p_module );
vlc_object_detach( p_sys->p_vout );
vlc_object_destroy( p_sys->p_vout );
/* Free the texture buffer*/
if( p_sys->p_buffer ) free( p_sys->p_buffer );
free( p_sys );
}
/*****************************************************************************
* Render: render previously calculated output
*****************************************************************************/
static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{
vout_sys_t *p_sys = p_vout->p_sys;
float f_width = (float)p_vout->output.i_width / p_sys->i_tex_width;
float f_height = (float)p_vout->output.i_height / p_sys->i_tex_height;
glClear( GL_COLOR_BUFFER_BIT );
glTexImage2D( GL_TEXTURE_2D, 0, 3,
p_sys->i_tex_width, p_sys->i_tex_height , 0,
VLCGL_RGB_FORMAT, VLCGL_RGB_TYPE, p_sys->p_buffer );
if( !p_sys->i_effect )
{
glEnable( GL_TEXTURE_2D );
glBegin( GL_POLYGON );
glTexCoord2f( 0.0, 0.0 ); glVertex2f( -1.0, 1.0 );
glTexCoord2f( f_width, 0.0 ); glVertex2f( 1.0, 1.0 );
glTexCoord2f( f_width, f_height ); glVertex2f( 1.0, -1.0 );
glTexCoord2f( 0.0, f_height ); glVertex2f( -1.0, -1.0 );
glEnd();
}
else
{
glRotatef( 1.0, 0.3, 0.5, 0.7 );
glEnable( GL_TEXTURE_2D );
glBegin( GL_QUADS );
/* Front */
glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, 1.0, 1.0 );
glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, - 1.0, 1.0 );
glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, - 1.0, 1.0 );
glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, 1.0, 1.0 );
/* Left */
glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, 1.0, - 1.0 );
glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, - 1.0, - 1.0 );
glTexCoord2f( f_width, f_height ); glVertex3f( - 1.0, - 1.0, 1.0 );
glTexCoord2f( f_width, 0 ); glVertex3f( - 1.0, 1.0, 1.0 );
/* Back */
glTexCoord2f( 0, 0 ); glVertex3f( 1.0, 1.0, - 1.0 );
glTexCoord2f( 0, f_height ); glVertex3f( 1.0, - 1.0, - 1.0 );
glTexCoord2f( f_width, f_height ); glVertex3f( - 1.0, - 1.0, - 1.0 );
glTexCoord2f( f_width, 0 ); glVertex3f( - 1.0, 1.0, - 1.0 );
/* Right */
glTexCoord2f( 0, 0 ); glVertex3f( 1.0, 1.0, 1.0 );
glTexCoord2f( 0, f_height ); glVertex3f( 1.0, - 1.0, 1.0 );
glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, - 1.0, - 1.0 );
glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, 1.0, - 1.0 );
/* Top */
glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, 1.0, - 1.0 );
glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, 1.0, 1.0 );
glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, 1.0, 1.0 );
glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, 1.0, - 1.0 );
/* Bottom */
glTexCoord2f( 0, 0 ); glVertex3f( - 1.0, - 1.0, 1.0 );
glTexCoord2f( 0, f_height ); glVertex3f( - 1.0, - 1.0, - 1.0 );
glTexCoord2f( f_width, f_height ); glVertex3f( 1.0, - 1.0, - 1.0 );
glTexCoord2f( f_width, 0 ); glVertex3f( 1.0, - 1.0, 1.0 );
glEnd();
}
glDisable( GL_TEXTURE_2D);
}
/*****************************************************************************
* DisplayVideo: displays previously rendered output
*****************************************************************************/
static void DisplayVideo( vout_thread_t *p_vout, picture_t *p_pic )
{
vout_sys_t *p_sys = p_vout->p_sys;
p_sys->p_vout->pf_swap( p_sys->p_vout );
}
int GetAlignedSize( int i_size )
{
/* Return the nearest power of 2 */
int i_result = 1;
while( i_result < i_size )
{
i_result *= 2;
}
return i_result;
}
......@@ -12,4 +12,6 @@ SOURCES_xvideo = \
SOURCES_glx = \
glx.c \
xcommon.c \
xcommon.h \
$(NULL)
/*****************************************************************************
* glx.c: GLX video output
* glx.c: GLX OpenGL provider
*****************************************************************************
* Copyright (C) 2004 VideoLAN
* $Id$
*
* Authors: Cyril Deguet <asmax@videolan.org>
* Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
......@@ -35,24 +36,24 @@
/* For the opengl provider interface */
#include "vlc_opengl.h"
#ifdef HAVE_SYS_SHM_H
# include <sys/shm.h> /* shmget(), shmctl() */
#endif
#include <X11/Xlib.h>
#include <X11/Xmd.h>
#include <X11/Xutil.h>
#include <GL/glx.h>
#include <X11/keysym.h>
#ifdef HAVE_SYS_SHM_H
# include <X11/extensions/XShm.h>
#endif
#ifdef DPMSINFO_IN_DPMS_H
# include <X11/extensions/dpms.h>
#endif
/* Data common to vout and opengl provider structures */
typedef struct glx_t
{
Display *p_display;
int b_glx13;
int i_width;
int i_height;
int b_fullscreen;
GLXContext gwctx;
Window wnd;
GLXWindow gwnd;
Atom wm_delete;
#include <GL/glx.h>
} glx_t;
#include "xcommon.h"
/* RV16 */
//#define VLCGL_RGB_FORMAT GL_RGB
......@@ -68,742 +69,255 @@ typedef struct glx_t
/*****************************************************************************
* Vout interface
*****************************************************************************/
static int CreateVout ( vlc_object_t * );
static void DestroyVout ( vlc_object_t * );
static int Init ( vout_thread_t * );
static void End ( vout_thread_t * );
static int Manage ( vout_thread_t * );
static void Render ( vout_thread_t *p_vout, picture_t *p_pic );
static void DisplayVideo ( vout_thread_t *, picture_t * );
/*****************************************************************************
* OpenGL providerinterface
* OpenGL provider interface
*****************************************************************************/
static int CreateOpenGL ( vlc_object_t * );
static void DestroyOpenGL( vlc_object_t * );
static int InitOpenGL ( opengl_t *, int, int );
static void SwapBuffers ( opengl_t * );
static int HandleEvents ( opengl_t * );
static void SwapBuffers ( vout_thread_t * );
/*****************************************************************************
* Local prototypes
*****************************************************************************/
static int OpenDisplay ( vlc_object_t *, glx_t * );
static void CloseDisplay( glx_t * );
static int InitGLX12 ( vlc_object_t *, glx_t * );
static int InitGLX13 ( vlc_object_t *, glx_t * );
static void CreateWindow( vlc_object_t *, glx_t *, XVisualInfo *);
static int HandleX11Events( vlc_object_t *, glx_t * );
static void SwitchContext( glx_t * );
static inline int GetAlignedSize( int i_size );
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 * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin();
set_description( _("X11 OpenGL (GLX) video output") );
set_capability( "video output", 20 );
add_shortcut( "glx" );
set_callbacks( CreateVout, DestroyVout );
add_submodule();
set_description( _("X11 OpenGL provider") );
set_capability( "opengl provider", 50 );
set_callbacks( CreateOpenGL, DestroyOpenGL );
vlc_module_end();
/*****************************************************************************
* vout_sys_t: GLX video output method descriptor
*****************************************************************************
* This structure is part of the video output thread descriptor.
* It describes the GLX specific properties of an output thread.
* Exported prototypes
*****************************************************************************/
struct vout_sys_t
{
uint8_t *p_buffer;
int i_index;
int i_tex_width;
int i_tex_height;
GLuint texture;
int i_effect; //XXX
glx_t glx;
};
struct opengl_sys_t
{
glx_t glx;
};
#define MWM_HINTS_DECORATIONS (1L << 1)
#define PROP_MWM_HINTS_ELEMENTS 5
typedef struct mwmhints_t
{
uint32_t flags;
uint32_t functions;
uint32_t decorations;
int32_t input_mode;
uint32_t status;
} mwmhints_t;
extern int E_(Activate) ( vlc_object_t * );
extern void E_(Deactivate) ( vlc_object_t * );
/*****************************************************************************
* CreateVout: allocates GLX video thread output method
*****************************************************************************
* This function allocates and initializes a GLX vout method.
* CreateOpenGL: initialize an OpenGL provider
*****************************************************************************/
static int CreateVout( vlc_object_t *p_this )
static int CreateOpenGL( vlc_object_t *p_this )
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vlc_bool_t b_glx13;
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
if( CheckGLX( p_this, &b_glx13 ) != VLC_SUCCESS )
{
msg_Err( p_vout, "out of memory" );
return( 1 );
msg_Err( p_vout, "no GLX support" );
return VLC_EGENERIC;
}
//XXX set to 0 to disable the cube effect
p_vout->p_sys->i_effect = 1;
p_vout->p_sys->glx.i_width = p_vout->i_window_width;
p_vout->p_sys->glx.i_height = p_vout->i_window_height;
p_vout->p_sys->glx.b_fullscreen = 0;
/* A texture must have a size aligned on a power of 2 */
p_vout->p_sys->i_tex_width = GetAlignedSize( p_vout->render.i_width );
p_vout->p_sys->i_tex_height = GetAlignedSize( p_vout->render.i_height );
msg_Dbg( p_vout, "Texture size: %dx%d", p_vout->p_sys->i_tex_width,
p_vout->p_sys->i_tex_height );
/* Open and initialize device */
if( OpenDisplay( p_this, &p_vout->p_sys->glx ) )
if( E_(Activate)( p_this ) != VLC_SUCCESS )
{
msg_Err( p_vout, "cannot open display" );
free( p_vout->p_sys );
return( 1 );
return VLC_EGENERIC;
}
p_vout->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = Manage;
p_vout->pf_render = Render;
p_vout->pf_display = DisplayVideo;
return( 0 );
}
/*****************************************************************************
* Init: initialize GLX video thread output method
*****************************************************************************/
static int Init( vout_thread_t *p_vout )
{
int i_pixel_pitch;
/* No YUV textures :( */
#if VLCGL_RGB_FORMAT == GL_RGB
# if VLCGL_RGB_TYPE == GL_UNSIGNED_BYTE
p_vout->output.i_chroma = VLC_FOURCC('R','V','2','4');
p_vout->output.i_rmask = 0x000000ff;
p_vout->output.i_gmask = 0x0000ff00;
p_vout->output.i_bmask = 0x00ff0000;
i_pixel_pitch = 3;
# else
p_vout->output.i_chroma = VLC_FOURCC('R','V','1','6');
p_vout->output.i_rmask = 0xf800;
p_vout->output.i_gmask = 0x07e0;
p_vout->output.i_bmask = 0x001f;
i_pixel_pitch = 2;
# endif
#else
p_vout->output.i_chroma = VLC_FOURCC('R','V','3','2');
p_vout->output.i_rmask = 0x000000ff;
p_vout->output.i_gmask = 0x0000ff00;