[Mplayer-cvslog] CVS: main/libvo vo_gl2.c,1.6,1.7 x11_common.h,1.10,1.11

[Sven Goethel]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv4294/main/libvo

Modified Files:
	vo_gl2.c x11_common.h 
Log Message:
printf-gcc3 patch, x11-commons mRootwin

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_gl2.c	24 Oct 2001 16:22:10 -0000	1.6
+++ vo_gl2.c	24 Oct 2001 17:04:08 -0000	1.7
@@ -42,6 +42,14 @@
 
 /* private prototypes */
 
+static const char * tweaks_used =
+#ifdef HAVE_MMX
+	"mmx_bpp"
+#else
+	"none"
+#endif
+	;
+
 /* local data */
 static unsigned char *ImageDataLocal=NULL;
 static unsigned char *ImageData=NULL;
@@ -661,7 +669,6 @@
 
 	xswa.background_pixel = 0;
 	xswa.border_pixel     = 1;
-//	xswa.colormap         = XCreateColormap(mDisplay, mRootWin, vinfo.visual, AllocNone);
 	xswa.colormap         = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone);
 	xswamask = CWBackPixel | CWBorderPixel | CWColormap;
 
@@ -910,19 +917,10 @@
   
   drawTextureDisplay ();
 
-#ifdef HAVE_MMX
   printf("[gl2] Using image_bpp=%d, image_bytes=%d, isBGR=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\tgl_alignment=%d, rgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s, tweaks=%s\n",
   	image_bpp, image_bytes, image_mode==MODE_BGR, 
         gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment,
-	rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s,
-	"mmx_bpp");
-#else
-  printf("[gl2] Using image_bpp=%d, image_bytes=%d, isBGR=%d, \n\tgl_bitmap_format=%s, gl_bitmap_type=%s, \n\tgl_alignment=%d, rgb_size=%d (%d,%d,%d), a_sz=%d, \n\tgl_internal_format=%s, tweaks=%s\n",
-  	image_bpp, image_bytes, image_mode==MODE_BGR, 
-        gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment,
-	rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s,
-	"none");
-#endif
+	rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s, tweaks_used);
 
   resize(d_width,d_height);
 

Index: x11_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- x11_common.h	31 Aug 2001 21:18:22 -0000	1.10
+++ x11_common.h	24 Oct 2001 17:04:08 -0000	1.11
@@ -9,7 +9,7 @@
 
 extern char *mDisplayName;
 extern Display *mDisplay;
-extern Window *mRootWin;
+extern Window mRootWin;
 extern int mScreen;
 extern int mLocalDisplay;