Gijs Vermeulen : dxgi: Introduce helper to convert between dxgi and wined3d scanline ordering types.

[Alexandre Julliard]

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

Author: Gijs Vermeulen 
Date:   Sun May 10 23:43:06 2020 +0200

dxgi: Introduce helper to convert between dxgi and wined3d scanline ordering types.

Signed-off-by: Gijs Vermeulen 
Signed-off-by: Henri Verbeet 
Signed-off-by: Alexandre Julliard

---

dlls/dxgi/output.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
index 85bfed0598..5d31a0093c 100644
--- a/dlls/dxgi/output.c
+++ b/dlls/dxgi/output.c
@@ -23,6 +23,11 @@

WINE_DEFAULT_DEBUG_CHANNEL(dxgi);

+static inline DXGI_MODE_SCANLINE_ORDER dxgi_mode_scanline_order_from_wined3d(enum wined3d_scanline_ordering ordering)
+{
+    return (DXGI_MODE_SCANLINE_ORDER)ordering;
+}
+
 static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_display_mode *wined3d_mode)
 {
     mode->Width = wined3d_mode->width;
@@ -30,7 +35,7 @@ static void dxgi_mode_from_wined3d(DXGI_MODE_DESC *mode, const struct wined3d_di
     mode->RefreshRate.Numerator = wined3d_mode->refresh_rate;
     mode->RefreshRate.Denominator = 1;
     mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id);
-    mode->ScanlineOrdering = wined3d_mode->scanline_ordering;
+    mode->ScanlineOrdering = dxgi_mode_scanline_order_from_wined3d(wined3d_mode->scanline_ordering);
     mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */
 }

@@ -41,7 +46,7 @@ static void dxgi_mode1_from_wined3d(DXGI_MODE_DESC1 *mode, const struct wined3d_
     mode->RefreshRate.Numerator = wined3d_mode->refresh_rate;
     mode->RefreshRate.Denominator = 1;
     mode->Format = dxgi_format_from_wined3dformat(wined3d_mode->format_id);
-    mode->ScanlineOrdering = wined3d_mode->scanline_ordering;
+    mode->ScanlineOrdering = dxgi_mode_scanline_order_from_wined3d(wined3d_mode->scanline_ordering);
     mode->Scaling = DXGI_MODE_SCALING_UNSPECIFIED; /* FIXME */
     mode->Stereo = FALSE; /* FIXME */
 }