More video_driver_get_size removal

Author: LibretroAdmin

gfx/drivers/d3d8.c

@@ -409,9 +409,8 @@ static void d3d8_set_vertices(
       unsigned pass,
       unsigned vert_width, unsigned vert_height, uint64_t frame_count)
 {
-   unsigned width, height;
-
-   video_driver_get_size(&width, &height);
+   unsigned width  = d3d->vp.full_width;
+   unsigned height = d3d->vp.full_height;
 
    if (chain->last_width != vert_width || chain->last_height != vert_height)
    {
@@ -572,15 +571,14 @@ static bool d3d8_setup_init(void *data,
       bool rgb32
       )
 {
-   unsigned width, height;
    d3d8_video_t *d3d                      = (d3d8_video_t*)data;
    settings_t *settings                   = config_get_ptr();
    LPDIRECT3DDEVICE8 d3dr                 = (LPDIRECT3DDEVICE8)d3d->dev;
    d3d8_renderchain_t *chain              = (d3d8_renderchain_t*)d3d->renderchain_data;
    unsigned fmt                           = (rgb32) ? RETRO_PIXEL_FORMAT_XRGB8888 : RETRO_PIXEL_FORMAT_RGB565;
    video_viewport_t *custom_vp            = &settings->video_vp_custom;
-
-   video_driver_get_size(&width, &height);
+   unsigned width                         = d3d->vp.full_width;
+   unsigned height                        = d3d->vp.full_height;
 
    chain->dev                             = dev_data;
    chain->pixel_size                      = (fmt == RETRO_PIXEL_FORMAT_RGB565)
@@ -1569,7 +1567,8 @@ static void d3d8_font_render_msg(
    if (!d3d)
       return;
 
-   video_driver_get_size(&width, &height);
+   width  = d3d->vp.full_width;
+   height = d3d->vp.full_height;
    if (!width || !height)
       return;
 
@@ -1781,21 +1780,18 @@ gfx_display_ctx_driver_t gfx_display_ctx_d3d8 = {
 
 static void d3d8_viewport_info(void *data, struct video_viewport *vp)
 {
-   unsigned width, height;
    d3d8_video_t *d3d   = (d3d8_video_t*)data;
 
    if (!d3d || !vp)
       return;
 
-   video_driver_get_size(&width, &height);
-
    vp->x            = d3d->out_vp.X;
    vp->y            = d3d->out_vp.Y;
    vp->width        = d3d->out_vp.Width;
    vp->height       = d3d->out_vp.Height;
 
-   vp->full_width   = width;
-   vp->full_height  = height;
+   vp->full_width   = d3d->vp.full_width;
+   vp->full_height  = d3d->vp.full_height;
 }
 
 static void d3d8_overlay_render(d3d8_video_t *d3d,
@@ -2104,22 +2100,25 @@ static void d3d8_make_d3dpp(void *data,
    if (!windowed_enable)
    {
 #ifdef _XBOX
-      /* Xbox: query the actual display size and publish it to
-       * video_st.  Use the same values directly for the d3dpp
-       * back-buffer rather than reading them back via
-       * video_driver_get_size (which would just return what we
-       * just wrote -- nothing else writes video_st->width /
-       * height except the video drivers themselves). */
+      /* Xbox: query the actual display size, publish it to video_st
+       * and track it in d3d->vp.full_width/full_height so subsequent
+       * read sites (font_render_msg, viewport_info, etc.) can pull
+       * from the local field instead of locking video_st. */
       unsigned width              = 0;
       unsigned height             = 0;
 
       d3d8_get_video_size(d3d, &width, &height);
       video_driver_set_size(width, height);
+      d3d->vp.full_width          = width;
+      d3d->vp.full_height         = height;
       d3dpp->BackBufferWidth      = width;
       d3dpp->BackBufferHeight     = height;
 #else
-      video_driver_get_size(&d3dpp->BackBufferWidth,
-            &d3dpp->BackBufferHeight);
+      /* Non-Xbox: by the time make_d3dpp runs, d3d8_init_internal
+       * has already published the size and written d3d->vp.
+       * full_width/full_height; read from there. */
+      d3dpp->BackBufferWidth      = d3d->vp.full_width;
+      d3dpp->BackBufferHeight     = d3d->vp.full_height;
 #endif
    }
 
@@ -2202,7 +2201,8 @@ static void d3d8_calculate_rect(void *data,
    struct video_viewport vp;
    d3d8_video_t *d3d         = (d3d8_video_t*)data;
 
-   video_driver_get_size(width, height);
+   *width  = d3d->vp.full_width;
+   *height = d3d->vp.full_height;
 
    vp.full_width  = *width;
    vp.full_height = *height;
@@ -2267,7 +2267,6 @@ static void d3d8_set_viewport(void *data,
 static bool d3d8_initialize(d3d8_video_t *d3d, const video_info_t *info)
 {
    struct LinkInfo link_info;
-   unsigned width, height;
    unsigned i           = 0;
    bool ret             = true;
    settings_t *settings = config_get_ptr();
@@ -2316,9 +2315,10 @@ static bool d3d8_initialize(d3d8_video_t *d3d, const video_info_t *info)
       )
       return false;
 
-   video_driver_get_size(&width, &height);
+   /* d3d->vp.full_* was written by the caller (d3d8_init_internal
+    * has already called set_size at this point). */
    d3d8_set_viewport(d3d,
-	   width, height, false, true);
+	   d3d->vp.full_width, d3d->vp.full_height, false, true);
 
    font_driver_init_osd(d3d, info,
          false,
@@ -2413,6 +2413,8 @@ static void d3d8_set_resize(d3d8_video_t *d3d,
    d3d->video_info.width  = new_width;
    d3d->video_info.height = new_height;
    video_driver_set_size(new_width, new_height);
+   d3d->vp.full_width     = new_width;
+   d3d->vp.full_height    = new_height;
 }
 
 static bool d3d8_alive(void *data)
@@ -2424,8 +2426,14 @@ static bool d3d8_alive(void *data)
    bool        quit     = false;
    bool        resize   = false;
 
-   /* Needed because some context drivers don't track their sizes */
-   video_driver_get_size(&temp_width, &temp_height);
+   /* Read from local bookkeeping rather than video_st (which
+    * would acquire context_lock + display_lock).  d3d->vp.full_*
+    * is written at every set_size call site in this driver, so
+    * it stays in sync with video_st->width/height as long as no
+    * other code path writes them.  In practice nothing does --
+    * see video_driver.c audit. */
+   temp_width  = d3d->vp.full_width;
+   temp_height = d3d->vp.full_height;
 
    win32_check_window(NULL, &quit, &resize, &temp_width, &temp_height);
 
@@ -2442,7 +2450,11 @@ static bool d3d8_alive(void *data)
    ret = !quit;
 
    if (temp_width != 0 && temp_height != 0)
+   {
       video_driver_set_size(temp_width, temp_height);
+      d3d->vp.full_width  = temp_width;
+      d3d->vp.full_height = temp_height;
+   }
 
    return ret;
 }
@@ -2543,6 +2555,8 @@ static bool d3d8_init_internal(d3d8_video_t *d3d,
       unsigned new_width  = info->fullscreen ? full_x : info->width;
       unsigned new_height = info->fullscreen ? full_y : info->height;
       video_driver_set_size(new_width, new_height);
+      d3d->vp.full_width  = new_width;
+      d3d->vp.full_height = new_height;
 
 #ifdef HAVE_WINDOW
       /* Use new_width / new_height directly rather than reading

gfx/drivers/network_gfx.c

@@ -343,17 +343,13 @@ static void network_gfx_set_nonblock_state(void *a, bool b, bool c, unsigned d)
 
 static bool network_gfx_alive(void *data)
 {
-   unsigned temp_width      = 0;
-   unsigned temp_height     = 0;
-   bool quit                = false;
-   bool resize              = false;
-   network_video_t *network = (network_video_t*)data;
-
-   video_driver_get_size(&temp_width, &temp_height);
-
-   if (temp_width != 0 && temp_height != 0)
-      video_driver_set_size(temp_width, temp_height);
-
+   /* The video_driver_get_size + conditional set_size dance that
+    * used to live here was a copy-paste from d3d8_alive, where the
+    * intermediate win32_check_window call mutates the fetched
+    * size on window resize.  The network driver has no equivalent
+    * windowing step, so the get/set was reading and writing back
+    * the same values -- a pure no-op.  Drop it. */
+   (void)data;
    return true;
 }
 

gfx/drivers/sixel_gfx.c

@@ -502,18 +502,13 @@ static bool sixel_gfx_frame(void *data, const void *frame,
 
 static bool sixel_gfx_alive(void *data)
 {
-   unsigned temp_width  = 0;
-   unsigned temp_height = 0;
-   bool quit            = false;
-   bool resize          = false;
-   sixel_t *sixel       = (sixel_t*)data;
-
-   /* Needed because some context drivers don't track their sizes */
-   video_driver_get_size(&temp_width, &temp_height);
-
-   if (temp_width != 0 && temp_height != 0)
-      video_driver_set_size(temp_width, temp_height);
-
+   /* The video_driver_get_size + conditional set_size dance that
+    * used to live here was a copy-paste from d3d8_alive, where the
+    * intermediate win32_check_window call mutates the fetched
+    * size on window resize.  sixel has no equivalent windowing
+    * step, so the get/set was reading and writing back the same
+    * values -- a pure no-op.  Drop it. */
+   (void)data;
    return true;
 }