[PATCH v6 0/2] MR11110: dxgi/tests: Skip tests if DXGI 1.4 is not available.

[Bernhard Übelacker (＠bernhardu)]

--
  v6: dxgi/tests: Skip tests if DXGI 1.4 is not available.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11110

[PATCH v6 1/2] dxgi/tests: Add two missing winetest_pop_context.

[Bernhard Übelacker]

From: Bernhard Übelacker <[e-mail]>

---
 dlls/dxgi/tests/dxgi.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index ecd0661ab25..99116f04004 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -7107,7 +7107,10 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12)
             }
             ok(mode_idx < mode_count, "Failed to find a different mode than %ux%u.\n", width, height);
             if (mode_idx >= mode_count)
+            {
+                winetest_pop_context();
                 continue;
+            }
 
             ret = ClipCursor(NULL);
             ok(ret, "ClipCursor failed, error %#lx.\n", GetLastError());
@@ -8248,6 +8251,7 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12))
     if (!(device = create_d3d12_device()))
     {
         skip("Failed to create Direct3D 12 device.\n");
+        winetest_pop_context();
         return;
     }
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/11110

[PATCH v6 2/2] dxgi/tests: Skip tests if DXGI 1.4 is not available.

[Bernhard Übelacker]

From: Bernhard Übelacker <[e-mail]>

DXGI_SWAP_EFFECT_FLIP_DISCARD fails without DXGI 1.4.

Co-authored-by: Henri Verbeet <[e-mail]>
---
 dlls/dxgi/tests/dxgi.c | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c
index 99116f04004..0886adf76bd 100644
--- a/dlls/dxgi/tests/dxgi.c
+++ b/dlls/dxgi/tests/dxgi.c
@@ -878,6 +878,20 @@ static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDX
     }
 }
 
+static BOOL dxgi_1_4_supported(IUnknown *device, BOOL is_d3d12)
+{
+    IDXGIFactory4 *factory4;
+    IDXGIFactory *factory;
+    HRESULT hr;
+
+    get_factory(device, is_d3d12, &factory);
+    if (SUCCEEDED(hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void**)&factory4)))
+        IDXGIFactory4_Release(factory4);
+    IDXGIFactory_Release(factory);
+
+    return SUCCEEDED(hr);
+}
+
 #define get_adapter(a, b) get_adapter_(__LINE__, a, b)
 static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d3d12)
 {
@@ -7254,15 +7268,18 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12)
     HRESULT hr;
     BOOL ret;
 
+    /* DXGI_SWAP_EFFECT_FLIP_DISCARD requires DXGI 1.4. */
+    if (!dxgi_1_4_supported(device, is_d3d12))
+    {
+        win_skip("DXGI 1.4 is not supported, skipping tests.\n");
+        return;
+    }
+
     get_factory(device, is_d3d12, &factory);
 
     hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory2, (void**)&factory2);
+    ok(hr == S_OK, "Got hr %#lx.\n", hr);
     IDXGIFactory_Release(factory);
-    if (FAILED(hr))
-    {
-        win_skip("IDXGIFactory2 not available.\n");
-        return;
-    }
 
     window = create_window();
 
@@ -7987,11 +8004,16 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12)
     IDXGISwapChain *swapchain;
     ID3D12Fence *fence;
     unsigned int i;
+    BOOL dxgi_1_4;
     HWND window;
     HRESULT hr;
 
     window = create_window();
 
+    /* DXGI_SWAP_EFFECT_FLIP_DISCARD requires DXGI 1.4. */
+    if (!(dxgi_1_4 = dxgi_1_4_supported(device, is_d3d12)))
+        win_skip("DXGI 1.4 is not supported, skipping DXGI_SWAP_EFFECT_FLIP_DISCARD tests.\n");
+
     for (i = 0; i < ARRAY_SIZE(tests); ++i)
     {
         DXGI_SWAP_EFFECT swap_effect = tests[i].swap_effect;
@@ -8000,6 +8022,8 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12)
         /* D3D12 only supports flip swap effects. */
         if (is_d3d12 && (swap_effect == DXGI_SWAP_EFFECT_DISCARD))
             continue;
+        if (!dxgi_1_4 && swap_effect == DXGI_SWAP_EFFECT_FLIP_DISCARD)
+            continue;
 
         winetest_push_context("test %u", i);
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/11110

[Bernhard Übelacker (＠bernhardu)]

v6:
- Unchanged except the added Co-authored-by.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11110#note_143381

[PATCH v6 0/2] MR11110: dxgi/tests: Skip tests if DXGI 1.4 is not available. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11110

[PATCH v6 0/2] MR11110: dxgi/tests: Skip tests if DXGI 1.4 is not available. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/11110