Mercurial > mplayer.hg
changeset 2455:712a46dff92d
printf-gcc3 patch, x11-commons mRootwin
| author | sven |
|---|---|
| date | Wed, 24 Oct 2001 17:04:08 +0000 |
| parents | b74c2a08eac9 |
| children | ac62521e4030 |
| files | libvo/vo_gl2.c libvo/x11_common.h |
| diffstat | 2 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl2.c Wed Oct 24 16:39:40 2001 +0000 +++ b/libvo/vo_gl2.c Wed Oct 24 17:04:08 2001 +0000 @@ -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);