comparison libvo/vo_gl.c @ 36156:056cd00eba14

Remove pointless function arguments. The have the same value as vo_dwidth/vo_dheight and whether those are used or the arguments is completely random, making the code hard to follow.

36155:29c690aefc6f

static void redraw(void);

static float video_matrix[16];

static void resize(int x,int y){
  // simple orthogonal projection for 0-image_width;0-image_height
  memset(video_matrix, 0, sizeof(video_matrix));
  video_matrix[0]  = 2.0/image_width;
  video_matrix[5]  = -2.0/image_height;
  video_matrix[12] = -1;
  video_matrix[13] = 1;
  video_matrix[15] = 1;
  mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y);
  if (WinID >= 0) {
    int left = 0, top = 0, w = x, h = y;
    geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight);
    top = y - h - top;
    mpglViewport(left, top, w, h);
  } else
    mpglViewport( 0, 0, x, y );

  ass_border_x = ass_border_y = 0;
  if (aspect_scaling() && use_aspect) {
    int new_w, new_h;
    double scale_x, scale_y;
    aspect(&new_w, &new_h, A_WINZOOM);
    panscan_calc_windowed();
    new_w += vo_panscan_x;
    new_h += vo_panscan_y;
    scale_x = (double)new_w / (double)x;
    scale_y = (double)new_h / (double)y;
    video_matrix[0]  *= scale_x;
    video_matrix[12] *= scale_x;
    video_matrix[5]  *= scale_y;
    video_matrix[13] *= scale_y;
    ass_border_x = (vo_dwidth - new_w) / 2;

/**
 * \brief Initialize a (new or reused) OpenGL context.
 * set global gl-related variables to their default values
 */
static int initGl(uint32_t d_width, uint32_t d_height) {
  GLint scale_type = get_scale_type(0);
  autodetectGlExtensions();
  using_tex_rect = gl_format == GL_YCBCR_422_APPLE || use_rectangle == 1;
  gl_target = using_tex_rect ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D;
  yuvconvtype = SET_YUV_CONVERSION(use_yuv) |

      }
    }
    update_yuvconv();
  }

  resize(d_width, d_height);

  mpglClearColor( 0.0f,0.0f,0.0f,0.0f );
  mpglClear( GL_COLOR_BUFFER_BIT );
  if (mpglSwapInterval && swap_interval >= 0)
    mpglSwapInterval(swap_interval);

#ifdef CONFIG_GL_OSX
static void osx_redraw(void)
{
  // resize will call redraw to refresh the screen
  resize(vo_dwidth, vo_dheight);
}
#endif

/* connect to server, create and map window,
 * allocate colors and (shared) memory

    return -1;
  if (mesa_buffer && !mpglAllocateMemoryMESA) {
    mp_msg(MSGT_VO, MSGL_ERR, "Can not enable mesa-buffer because AllocateMemoryMESA was not found\n");
    mesa_buffer = 0;
  }
  initGl(vo_dwidth, vo_dheight);

#ifdef CONFIG_GL_OSX
  vo_osx_redraw_func = osx_redraw;
#endif
  return 0;

static void check_events(void)
{
    int e=glctx.check_events();
    if(e&VO_EVENT_REINIT) {
        uninitGl();
        initGl(vo_dwidth, vo_dheight);
    }
    if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight);
    else if(e&VO_EVENT_EXPOSE) redraw();
}

/**
 * Creates the textures and the display list needed for displaying

  case VOCTRL_ONTOP:
    glctx.ontop();
    return VO_TRUE;
  case VOCTRL_FULLSCREEN:
    glctx.fullscreen();
    resize(vo_dwidth, vo_dheight);
    return VO_TRUE;
  case VOCTRL_BORDER:
    glctx.border();
    resize(vo_dwidth, vo_dheight);
    return VO_TRUE;
  case VOCTRL_GET_PANSCAN:
    if (!use_aspect) return VO_NOTIMPL;
    return VO_TRUE;
  case VOCTRL_SET_PANSCAN:
    if (!use_aspect) return VO_NOTIMPL;
    resize(vo_dwidth, vo_dheight);
    return VO_TRUE;
  case VOCTRL_GET_EQUALIZER:
    if (is_yuv) {
      int i;
      vf_equalizer_t *eq=data;

36156:056cd00eba14

static void redraw(void);

static float video_matrix[16];

static void resize(void) {
  // simple orthogonal projection for 0-image_width;0-image_height
  memset(video_matrix, 0, sizeof(video_matrix));
  video_matrix[0]  = 2.0/image_width;
  video_matrix[5]  = -2.0/image_height;
  video_matrix[12] = -1;
  video_matrix[13] = 1;
  video_matrix[15] = 1;
  mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n", vo_dwidth, vo_dheight);
  if (WinID >= 0) {
    int left = 0, top = 0, w = vo_dwidth, h = vo_dheight;
    geometry(&left, &top, &w, &h, vo_dwidth, vo_dheight);
    top = vo_dheight - h - top;
    mpglViewport(left, top, w, h);
  } else
    mpglViewport(0, 0, vo_dwidth, vo_dheight);

  ass_border_x = ass_border_y = 0;
  if (aspect_scaling() && use_aspect) {
    int new_w, new_h;
    double scale_x, scale_y;
    aspect(&new_w, &new_h, A_WINZOOM);
    panscan_calc_windowed();
    new_w += vo_panscan_x;
    new_h += vo_panscan_y;
    scale_x = (double)new_w / (double)vo_dwidth;
    scale_y = (double)new_h / (double)vo_dheight;
    video_matrix[0]  *= scale_x;
    video_matrix[12] *= scale_x;
    video_matrix[5]  *= scale_y;
    video_matrix[13] *= scale_y;
    ass_border_x = (vo_dwidth - new_w) / 2;

/**
 * \brief Initialize a (new or reused) OpenGL context.
 * set global gl-related variables to their default values
 */
static int initGl(void) {
  GLint scale_type = get_scale_type(0);
  autodetectGlExtensions();
  using_tex_rect = gl_format == GL_YCBCR_422_APPLE || use_rectangle == 1;
  gl_target = using_tex_rect ? GL_TEXTURE_RECTANGLE : GL_TEXTURE_2D;
  yuvconvtype = SET_YUV_CONVERSION(use_yuv) |

      }
    }
    update_yuvconv();
  }

  resize();

  mpglClearColor( 0.0f,0.0f,0.0f,0.0f );
  mpglClear( GL_COLOR_BUFFER_BIT );
  if (mpglSwapInterval && swap_interval >= 0)
    mpglSwapInterval(swap_interval);

#ifdef CONFIG_GL_OSX
static void osx_redraw(void)
{
  // resize will call redraw to refresh the screen
  resize();
}
#endif

/* connect to server, create and map window,
 * allocate colors and (shared) memory

    return -1;
  if (mesa_buffer && !mpglAllocateMemoryMESA) {
    mp_msg(MSGT_VO, MSGL_ERR, "Can not enable mesa-buffer because AllocateMemoryMESA was not found\n");
    mesa_buffer = 0;
  }
  initGl();

#ifdef CONFIG_GL_OSX
  vo_osx_redraw_func = osx_redraw;
#endif
  return 0;

static void check_events(void)
{
    int e=glctx.check_events();
    if(e&VO_EVENT_REINIT) {
        uninitGl();
        initGl();
    }
    if(e&VO_EVENT_RESIZE) resize();
    else if(e&VO_EVENT_EXPOSE) redraw();
}

/**
 * Creates the textures and the display list needed for displaying

  case VOCTRL_ONTOP:
    glctx.ontop();
    return VO_TRUE;
  case VOCTRL_FULLSCREEN:
    glctx.fullscreen();
    resize();
    return VO_TRUE;
  case VOCTRL_BORDER:
    glctx.border();
    resize();
    return VO_TRUE;
  case VOCTRL_GET_PANSCAN:
    if (!use_aspect) return VO_NOTIMPL;
    return VO_TRUE;
  case VOCTRL_SET_PANSCAN:
    if (!use_aspect) return VO_NOTIMPL;
    resize();
    return VO_TRUE;
  case VOCTRL_GET_EQUALIZER:
    if (is_yuv) {
      int i;
      vf_equalizer_t *eq=data;