Conor McCarthy : dxgi: Add support for DXGI_SCALING_NONE.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: fabd07d520d3ad40bb24d39e61867e1d39736ace
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fabd07d520d3ad40bb24d39e61867e1d39736ace

Author: Conor McCarthy <cmccarthy at codeweavers.com>
Date:   Fri Oct 18 00:57:09 2019 +1000

dxgi: Add support for DXGI_SCALING_NONE.

In fullscreen mode, Shadow of the Tomb Raider uses an unscaled swapchain
that is oversized by 1x1 pixel. The pixel-wide lines on the right and
bottom should be clipped to fit the display. This eliminates the two
lines of uninitialized data.

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dxgi/swapchain.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index 53dabe7cde..9e620e0b1e 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -1432,8 +1432,19 @@ static VkResult d3d12_swapchain_record_swapchain_blit(struct d3d12_swapchain *sw
     blit.dstOffsets[0].x = 0;
     blit.dstOffsets[0].y = 0;
     blit.dstOffsets[0].z = 0;
-    blit.dstOffsets[1].x = swapchain->vk_swapchain_width;
-    blit.dstOffsets[1].y = swapchain->vk_swapchain_height;
+    if (swapchain->desc.Scaling == DXGI_SCALING_NONE)
+    {
+        blit.srcOffsets[1].x = min(swapchain->vk_swapchain_width, blit.srcOffsets[1].x);
+        blit.srcOffsets[1].y = min(swapchain->vk_swapchain_height, blit.srcOffsets[1].y);
+        blit.dstOffsets[1].x = blit.srcOffsets[1].x;
+        blit.dstOffsets[1].y = blit.srcOffsets[1].y;
+    }
+    else
+    {
+        /* FIXME: handle DXGI_SCALING_ASPECT_RATIO_STRETCH. */
+        blit.dstOffsets[1].x = swapchain->vk_swapchain_width;
+        blit.dstOffsets[1].y = swapchain->vk_swapchain_height;
+    }
     blit.dstOffsets[1].z = 1;
 
     vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer,
@@ -2873,7 +2884,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI
 
     if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT)
         FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage);
-    if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH)
+    if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH && swapchain_desc->Scaling != DXGI_SCALING_NONE)
         FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling);
     if (swapchain_desc->AlphaMode && swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE)
         FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode);