mplayer.hg: libvo/vo_gl.c comparison

comparison libvo/vo_gl.c @ 13843:3f28d2a56758

fullscreen fixes and GUI support for vo_gl

author	reimar
date	Mon, 01 Nov 2004 20:24:37 +0000
parents	b34c5aa5f798
children	8298dc8ca78b

comparison

equal deleted inserted replaced

-:78e5886bc211
+:3f28d2a56758
 #include <GL/gl.h>
 #include "gl_common.h"
 #include "x11_common.h"
 #include "aspect.h"
+#ifdef HAVE_NEW_GUI
+#include "Gui/interface.h"
+#endif
 static vo_info_t info =
 {
 	"X11 (OpenGL)",
 	"gl",
 	""
 };
 LIBVO_EXTERN(gl)
-static GLXContext wsGLXContext;
+static XVisualInfo *gl_vinfo = NULL;
+static GLXContext gl_context = 0;
 static int                  wsGLXAttrib[] = { GLX_RGBA,
 GLX_RED_SIZE,1,
 GLX_GREEN_SIZE,1,
 GLX_BLUE_SIZE,1,
 GLX_DOUBLEBUFFER,
 gl_texfmt = TEXTUREFORMAT_ALWAYS;
 #endif
 return 1;
 }
+/**
+* \brief Initialize a (new or reused) OpenGL context.
+*/
+static int initGl(uint32_t d_width, uint32_t d_height) {
+unsigned char *ImageData = NULL;
+texture_width = 32;
+while (texture_width < image_width ||
+texture_width < image_height)
+texture_width *= 2;
+texture_height = texture_width;
+glDisable(GL_BLEND);
+glDisable(GL_DEPTH_TEST);
+glDepthMask(GL_FALSE);
+glDisable(GL_CULL_FACE);
+glEnable(GL_TEXTURE_2D);
+mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",
+texture_width, texture_height);
+glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+glAdjustAlignment(texture_width * image_bytes);
+ImageData = malloc(texture_width * texture_height * image_bytes);
+memset(ImageData, 0, texture_width * texture_height * image_bytes);
+glTexImage2D(GL_TEXTURE_2D, 0, gl_texfmt, texture_width, texture_height, 0,
+gl_format, gl_type, ImageData);
+free (ImageData);
+// set alignment as default is 4 which will break some files
+glAdjustAlignment(image_width * image_bytes);
+resize(d_width, d_height);
+glClearColor( 0.0f,0.0f,0.0f,0.0f );
+glClear( GL_COLOR_BUFFER_BIT );
+}
 /* connect to server, create and map window,
 * allocate colors and (shared) memory
 */
 static uint32_t
 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
 {
-	unsigned char *ImageData=NULL;
-//	int screen;
-	unsigned int fg, bg;
-	XSizeHints hint;
-	XVisualInfo *vinfo;
-	XEvent xev;
-//	XGCValues xgcv;
 	image_height = height;
 	image_width = width;
 	find_gl_format (format);
-vo_dwidth = d_width;
-vo_dheight = d_height;
 sub_bg_alpha = 255; // We need alpha = 255 for invisible part of the OSD
 	int_pause = 0;
 	panscan_init();
 #ifdef X11_FULLSCREEN
 //        if( flags&0x01 ){ // (-fs)
 //          aspect(&d_width,&d_height,A_ZOOM);
 //        }
 #endif
+#ifdef HAVE_NEW_GUI
+if (use_gui) {
+// GUI creates and manages window for us
+vo_dwidth = d_width;
+vo_dheight= d_height;
+guiGetEvent(guiSetShVideo, 0);
+setGlWindow(&gl_vinfo, &gl_context, vo_window);
+initGl(vo_dwidth, vo_dheight);
+return 0;
+}
+#endif
+if ( vo_window == None ) {
+	unsigned int fg, bg;
+	XSizeHints hint;
+	XVisualInfo *vinfo;
+	XEvent xev;
+	vo_dwidth = d_width;
+	vo_dheight = d_height;
 	hint.x = 0;
 	hint.y = 0;
 	hint.width = d_width;
 	hint.height = d_height;
 	hint.flags = PPosition | PSize;
 return -1;
 }
-	if ( vo_window == None )
-	 {
 vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo->visual, hint.x, hint.y, hint.width, hint.height,
 			                          vinfo->depth, XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone));
 vo_x11_classhint( mDisplay,vo_window,"gl" );
 vo_hidecursor(mDisplay,vo_window);
 	  XSelectInput(mDisplay, vo_window, StructureNotifyMask);
 	  /* Tell other applications about this window */
 	  XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
 	  /* Map window. */
 	  XMapWindow(mDisplay, vo_window);
-	  if ( flags&1 ) vo_x11_fullscreen();
 #ifdef HAVE_XINERAMA
 	  vo_x11_xinerama_move(mDisplay,vo_window);
 #endif
 	  /* Wait for map. */
 		XNextEvent(mDisplay, &xev);
 	  }
 	  while (xev.type != MapNotify || xev.xmap.event != vo_window);
 	  XSelectInput(mDisplay, vo_window, NoEventMask);
-	 }
-	if ( vo_config_count ) glXDestroyContext( mDisplay,wsGLXContext );
-wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );
-glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
 	XSync(mDisplay, False);
 	vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
 		     | ButtonPressMask | ButtonReleaseMask | ExposureMask
 );
+}
-texture_width=32;
-while(texture_width<image_width || texture_width<image_height) texture_width*=2;
-texture_height=texture_width;
-ImageData=malloc(texture_width*texture_height*image_bytes);
-memset(ImageData,0,texture_width*texture_height*image_bytes);
-glDisable(GL_BLEND);
-glDisable(GL_DEPTH_TEST);
-glDepthMask(GL_FALSE);
-glDisable(GL_CULL_FACE);
-glEnable(GL_TEXTURE_2D);
-// set alignment as default is 4 which will break some files
-glAdjustAlignment(image_width * image_bytes);
-mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",texture_width,texture_height);
-#if 1
-//  glBindTexture(GL_TEXTURE_2D, texture_id);
-glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-glTexImage2D(GL_TEXTURE_2D, 0, gl_texfmt, texture_width, texture_height, 0,
-gl_format, gl_type, ImageData);
-#endif
-free (ImageData);
-resize(d_width,d_height);
-glClearColor( 0.0f,0.0f,0.0f,0.0f );
-glClear( GL_COLOR_BUFFER_BIT );
-//  printf("OpenGL setup OK!\n");
 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
+vo_x11_nofs_sizepos(0, 0, d_width, d_height);
+if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
+vo_x11_fullscreen();
+setGlWindow(&gl_vinfo, &gl_context, vo_window);
+initGl(vo_dwidth, vo_dheight);
 	return 0;
 }
 static void check_events(void)
 static void
 uninit(void)
 {
 if ( !vo_config_count ) return;
+releaseGlContext(&gl_vinfo, &gl_context);
 vo_x11_uninit();
 }
 static uint32_t preinit(const char *arg)
 {
 switch (request) {
 case VOCTRL_PAUSE: return (int_pause=1);
 case VOCTRL_RESUME: return (int_pause=0);
 case VOCTRL_QUERY_FORMAT:
 return query_format(*((uint32_t*)data));
+case VOCTRL_GUISUPPORT:
+return VO_TRUE;
 case VOCTRL_ONTOP:
 vo_x11_ontop();
 return VO_TRUE;
 case VOCTRL_FULLSCREEN:
 vo_x11_fullscreen();

Mercurial > mplayer.hg

comparison libvo/vo_gl.c @ 13843:3f28d2a56758