Mercurial > mplayer.hg

comparison libvo/vo_gl2.c @ 2455:712a46dff92d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
printf-gcc3 patch, x11-commons mRootwin
author sven
date Wed, 24 Oct 2001 17:04:08 +0000
parents f8978836ef7f
children ae79207a3055
comparison
equal deleted inserted replaced
2454:b74c2a08eac9 2455:712a46dff92d
39 "Arpad Gereoffy & Sven Goethel", 39 "Arpad Gereoffy & Sven Goethel",
40 "" 40 ""
41 }; 41 };
42 42
43 /* private prototypes */ 43 /* private prototypes */
44
45 static const char * tweaks_used =
46 #ifdef HAVE_MMX
47 "mmx_bpp"
48 #else
49 "none"
50 #endif
51 ;
44 52
45 /* local data */ 53 /* local data */
46 static unsigned char *ImageDataLocal=NULL; 54 static unsigned char *ImageDataLocal=NULL;
47 static unsigned char *ImageData=NULL; 55 static unsigned char *ImageData=NULL;
48 56
659 return -1; 667 return -1;
660 } 668 }
661 669
662 xswa.background_pixel = 0; 670 xswa.background_pixel = 0;
663 xswa.border_pixel = 1; 671 xswa.border_pixel = 1;
664 // xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo.visual, AllocNone);
665 xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone); 672 xswa.colormap = XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone);
666 xswamask = CWBackPixel | CWBorderPixel | CWColormap; 673 xswamask = CWBackPixel | CWBorderPixel | CWColormap;
667 674
668 mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen), 675 mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen),
669 hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa); 676 hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa);
908 gl_set_antialias(0); 915 gl_set_antialias(0);
909 gl_set_bilinear(1); 916 gl_set_bilinear(1);
910 917
911 drawTextureDisplay (); 918 drawTextureDisplay ();
912 919
913 #ifdef HAVE_MMX
914 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", 920 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",
915 image_bpp, image_bytes, image_mode==MODE_BGR, 921 image_bpp, image_bytes, image_mode==MODE_BGR,
916 gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment, 922 gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment,
917 rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s, 923 rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s, tweaks_used);
918 "mmx_bpp");
919 #else
920 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",
921 image_bpp, image_bytes, image_mode==MODE_BGR,
922 gl_bitmap_format_s, gl_bitmap_type_s, gl_alignment,
923 rgb_sz, r_sz, g_sz, b_sz, a_sz, gl_internal_format_s,
924 "none");
925 #endif
926 924
927 resize(d_width,d_height); 925 resize(d_width,d_height);
928 926
929 glClearColor( 0.0f,0.0f,0.0f,0.0f ); 927 glClearColor( 0.0f,0.0f,0.0f,0.0f );
930 glClear( GL_COLOR_BUFFER_BIT ); 928 glClear( GL_COLOR_BUFFER_BIT );