diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-01-23 23:27:10 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2002-01-23 23:27:10 +0000 |
| commit | 6f8315d8f65066fda4ca9498f5d7beec46729d11 (patch) | |
| tree | 09492f88f47c35a86dbb6f2eb07eec2ff0e46439 /src | |
| parent | cb0c0151971264dc780f0ec67571ebb79865496a (diff) | |
| download | xine-lib-6f8315d8f65066fda4ca9498f5d7beec46729d11.tar.gz xine-lib-6f8315d8f65066fda4ca9498f5d7beec46729d11.tar.bz2 | |
Change/fix opengl checks, add a glut fallback (GLU).
CVS patchset: 1445
CVS date: 2002/01/23 23:27:10
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_out/Makefile.am | 2 | ||||
| -rw-r--r-- | src/video_out/video_out_opengl.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index b8ae2c2f3..7b45d752c 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -49,7 +49,7 @@ xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ alphablend.c video_out_opengl.c -xineplug_vo_out_opengl_la_LIBADD = $(OPENGL_LIBS) $(GLUT_LIBS) $(X_LIBS) +xineplug_vo_out_opengl_la_LIBADD = $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 74bc39775..8a2993de9 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_opengl.c,v 1.3 2002/01/23 15:05:46 richwareham Exp $ + * $Id: video_out_opengl.c,v 1.4 2002/01/23 23:27:10 f1rmb Exp $ * * video_out_glut.c, glut based OpenGL rendering interface for xine * Matthias Hopf <mat@mshopf.de> @@ -71,7 +71,13 @@ #include <GL/gl.h> #include <GL/glx.h> +#ifdef HAVE_GLUT #include <GL/glut.h> +#else +#ifdef HAVE_GLU +#include <GL/glu.h> +#endif +#endif #include <sys/ipc.h> #include <sys/shm.h> @@ -664,6 +670,7 @@ static void opengl_render_image (opengl_driver_t *this, opengl_frame_t *frame, (GLfloat)(this->window_width)/ (GLfloat)(this->window_height), 1.0f, 1000.0f); + glMatrixMode (GL_MODELVIEW); glLoadIdentity (); @@ -937,7 +944,7 @@ static int opengl_gui_data_exchange (vo_driver_t *this_gen, switch (data_type) { case GUI_SELECT_VISUAL: -/*fprintf (stderr, "*** gui_select_visual ***\n"); */ +fprintf (stderr, "*** gui_select_visual ***\n"); XLockDisplay (this->display); this->vinfo = glXChooseVisual (this->display, this->screen, glxAttrib); XUnlockDisplay (this->display); |