[pull] master from libretro:master

gfx/common/d3d9_common.c

@@ -343,7 +343,7 @@ void d3d9_make_d3dpp(d3d9_video_t *d3d,
       unsigned width  = 0;
       unsigned height = 0;
       d3d9_get_video_size(d3d, &width, &height);
-      video_driver_set_size(width, height);
+      video_driver_set_output_size(width, height);
       d3d->vp.full_width  = width;
       d3d->vp.full_height = height;
       d3dpp->BackBufferWidth  = width;

gfx/common/dxgi_common.c

@@ -15,6 +15,7 @@
 
 #include <compat/strl.h>
 #include <retro_environment.h>
+#include <gfx/scaler/pixconv.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -1142,33 +1143,13 @@ void dxgi_copy(
          {
             case DXGI_FORMAT_R8G8B8A8_UNORM:
             {
-               {
-                  const UINT16* src_ptr = (const UINT16*)src_data;
-                  UINT32*       dst_ptr = (UINT32*)dst_data;
-                  int sp = src_pitch;
-                  int dp = dst_pitch;
-                  if (sp)
-                     sp -= width * sizeof(*src_ptr);
-                  if (dp)
-                     dp -= width * sizeof(*dst_ptr);
-                  for (i = 0; i < height; i++)
-                  {
-                     for (j = 0; j < width; j++)
-                     {
-                        unsigned r = 0, g = 0, b = 0;
-                        UINT16 src_val = *src_ptr++;
-                        r = (src_val >> 11) & 31;
-                        r = (r << 3) | (r >> 2);
-                        g = (src_val >> 5) & 63;
-                        g = (g << 2) | (g >> 4);
-                        b = (src_val >> 0) & 31;
-                        b = (b << 3) | (b >> 2);
-                        *dst_ptr++ = (r << 0) | (g << 8) | (b << 16) | (255 << 24);
-                     }
-                     src_ptr = (UINT16*)((UINT8*)src_ptr + sp);
-                     dst_ptr = (UINT32*)((UINT8*)dst_ptr + dp);
-                  }
-               }
+               /* RGB565 -> R8G8B8A8 (byte order [r g b a]) is exactly
+                * conv_rgb565_abgr8888 in pixconv (uint32 LE
+                * (a << 24) | (b << 16) | (g << 8) | r). */
+               int sp = src_pitch ? src_pitch : (int)(width * sizeof(UINT16));
+               int dp = dst_pitch ? dst_pitch : (int)(width * sizeof(UINT32));
+               conv_rgb565_abgr8888(dst_data, src_data,
+                     width, height, dp, sp);
                break;
             }
             case DXGI_FORMAT_B8G8R8X8_UNORM:
@@ -1329,33 +1310,13 @@ void dxgi_copy(
             }
             case DXGI_FORMAT_B8G8R8A8_UNORM:
             {
-               {
-                  const UINT16* src_ptr = (const UINT16*)src_data;
-                  UINT32*       dst_ptr = (UINT32*)dst_data;
-                  int sp = src_pitch;
-                  int dp = dst_pitch;
-                  if (sp)
-                     sp -= width * sizeof(*src_ptr);
-                  if (dp)
-                     dp -= width * sizeof(*dst_ptr);
-                  for (i = 0; i < height; i++)
-                  {
-                     for (j = 0; j < width; j++)
-                     {
-                        unsigned r = 0, g = 0, b = 0;
-                        UINT16 src_val = *src_ptr++;
-                        r = (src_val >> 11) & 31;
-                        r = (r << 3) | (r >> 2);
-                        g = (src_val >> 5) & 63;
-                        g = (g << 2) | (g >> 4);
-                        b = (src_val >> 0) & 31;
-                        b = (b << 3) | (b >> 2);
-                        *dst_ptr++ = (r << 16) | (g << 8) | (b << 0) | (255 << 24);
-                     }
-                     src_ptr = (UINT16*)((UINT8*)src_ptr + sp);
-                     dst_ptr = (UINT32*)((UINT8*)dst_ptr + dp);
-                  }
-               }
+               /* RGB565 -> B8G8R8A8 (byte order [b g r a]) is exactly
+                * conv_rgb565_argb8888 in pixconv (uint32 LE
+                * (a << 24) | (r << 16) | (g << 8) | b). */
+               int sp = src_pitch ? src_pitch : (int)(width * sizeof(UINT16));
+               int dp = dst_pitch ? dst_pitch : (int)(width * sizeof(UINT32));
+               conv_rgb565_argb8888(dst_data, src_data,
+                     width, height, dp, sp);
                break;
             }
             case DXGI_FORMAT_EX_A4R4G4B4_UNORM:

gfx/common/gdi_defines.h

@@ -107,19 +107,18 @@ typedef struct gdi
    unsigned  scratch_rgui_w;
    unsigned  scratch_rgui_h;
 
-   unsigned video_width;
-   unsigned video_height;
+   unsigned frame_width;
+   unsigned frame_height;
    unsigned screen_width;
    unsigned screen_height;
-   /* Surface (window) size last published via video_driver_set_size,
-    * tracked here so gdi_alive can read it without locking.  Distinct
-    * from video_width / video_height which is the core's frame size. */
+   /* Surface (window) size last published via video_driver_set_output_size,
+    * tracked here so gdi_alive can read it without locking. */
    unsigned full_width;
    unsigned full_height;
-   /* Actual size of gdi->bmp (the DDB).  Separate from video_width
+   /* Actual size of gdi->bmp (the DDB).  Separate from frame_width
     * because when RGUI is active we draw the menu (a different size
     * than the core) into bmp; without a dedicated tracker, the
-    * comparison against video_width would trigger a destructive
+    * comparison against frame_width would trigger a destructive
     * DeleteObject + CreateCompatibleBitmap on every frame, racing
     * with WM_PAINT and producing visible flicker. */
    unsigned bmp_width;
@@ -128,8 +127,8 @@ typedef struct gdi
    unsigned menu_width;
    unsigned menu_height;
    unsigned menu_pitch;
-   unsigned video_pitch;
-   unsigned video_bits;
+   unsigned frame_pitch;
+   unsigned frame_bits;
    unsigned menu_bits;
    int win_major;
    int win_minor;