comparison libvo/vo_gl2.c @ 12750:38c660174053

removed XFlush() before XSync(), made config_glx return-type signed, force 32bit on Darwin, idea from a patch by Marc Hoffman (mmh <at> pleasantst.com).

12749:86774b3d5ede

#include "aspect.h"

#define NDEBUG
//#undef NDEBUG

#undef TEXTUREFORMAT_ALWAYS_RGB24

static vo_info_t info = 
{
	"X11 (OpenGL) - multiple textures version",
	"gl2",

	if (best_weight < 1000000) *res_vi = vi_list[best_i];
	XFree(vi_list);
	return (best_weight < 1000000) ? 0 : -1;
}

static uint32_t config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) {
	XSizeHints hint;
	XVisualInfo *vinfo, vinfo_buf;
	XEvent xev;

		hint.x = 0;

  wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );

        glXMakeCurrent( mDisplay,vo_window,wsGLXContext );

	XFlush(mDisplay);
	XSync(mDisplay, False);

	//XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!!
        vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
		 | ButtonPressMask | ButtonReleaseMask | ExposureMask

        return 0;
}

#ifdef HAVE_NEW_GUI
static uint32_t config_glx_gui(uint32_t d_width, uint32_t d_height) {
  XWindowAttributes xw_attr;
  XVisualInfo *vinfo, vinfo_template;
  int tmp;
  vo_dwidth = d_width;
  vo_dheight = d_height;

    mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] Could not create GLX context!\n");
    XFree(vinfo);
    return -1;
  }
  glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
  XFlush(mDisplay);
  XSync(mDisplay, False);

  if (glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &r_sz) != 0) r_sz = 0;
  if (glXGetConfig(mDisplay,vinfo,GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0;
  if (glXGetConfig(mDisplay,vinfo,GLX_BLUE_SIZE, &b_sz) != 0) b_sz = 0;

  } else {
	  gl_internal_format=GL_RGB;
	  gl_internal_format_s="GL_RGB";
  }

#ifdef TEXTUREFORMAT_ALWAYS_RGB24
  gl_internal_format=GL_RGB8;
  gl_internal_format_s="GL_RGB8";
#endif

  if (IMGFMT_IS_BGR(format))
  {
    image_mode=MODE_BGR;

static uint32_t
query_format(uint32_t format)
{
    switch(format){
    case IMGFMT_RGB24:
    case IMGFMT_BGR24:
//    case IMGFMT_RGB32:
//    case IMGFMT_BGR32:
        return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
    }
    return 0;
}

12750:38c660174053

#include "aspect.h"

#define NDEBUG
//#undef NDEBUG

#undef TEXTUREFORMAT_ALWAYS
#undef TEXTUREFORMAT_ALWAYS_S
#ifdef SYS_DARWIN
#define TEXTUREFORMAT_ALWAYS GL_RGB8
#define TEXTUREFORMAT_ALWAYS_S "GL_RGB8"
#endif

static vo_info_t info = 
{
	"X11 (OpenGL) - multiple textures version",
	"gl2",

	if (best_weight < 1000000) *res_vi = vi_list[best_i];
	XFree(vi_list);
	return (best_weight < 1000000) ? 0 : -1;
}

static int config_glx(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format) {
	XSizeHints hint;
	XVisualInfo *vinfo, vinfo_buf;
	XEvent xev;

		hint.x = 0;

  wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );

        glXMakeCurrent( mDisplay,vo_window,wsGLXContext );

	XSync(mDisplay, False);

	//XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!!
        vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
		 | ButtonPressMask | ButtonReleaseMask | ExposureMask

        return 0;
}

#ifdef HAVE_NEW_GUI
static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
  XWindowAttributes xw_attr;
  XVisualInfo *vinfo, vinfo_template;
  int tmp;
  vo_dwidth = d_width;
  vo_dheight = d_height;

    mp_msg(MSGT_VO, MSGL_FATAL, "[gl2] Could not create GLX context!\n");
    XFree(vinfo);
    return -1;
  }
  glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
  XSync(mDisplay, False);

  if (glXGetConfig(mDisplay,vinfo,GLX_RED_SIZE, &r_sz) != 0) r_sz = 0;
  if (glXGetConfig(mDisplay,vinfo,GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0;
  if (glXGetConfig(mDisplay,vinfo,GLX_BLUE_SIZE, &b_sz) != 0) b_sz = 0;

  } else {
	  gl_internal_format=GL_RGB;
	  gl_internal_format_s="GL_RGB";
  }

#ifdef TEXTUREFORMAT_ALWAYS
  gl_internal_format=TEXTURE_FORMAT_ALWAYS;
  gl_internal_format_s=TEXTURE_FORMAT_ALWAYS_S;
#endif

  if (IMGFMT_IS_BGR(format))
  {
    image_mode=MODE_BGR;

static uint32_t
query_format(uint32_t format)
{
    switch(format){
#ifdef SYS_DARWIN
    case IMGFMT_RGB32:
#else
    case IMGFMT_RGB24:
    case IMGFMT_BGR24:
//    case IMGFMT_RGB32:
//    case IMGFMT_BGR32:
#endif
        return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD;
    }
    return 0;
}