[PATCH 0/1] MR5553: wined3d: Fix GLSL version comparison.

[PATCH 1/1] wined3d: Fix GLSL version comparison.

[Zebediah Figura]

From: Zebediah Figura

Fixes: 010008f629dd0590978095942ded8851ee3a9e17
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56615
---
 dlls/d3d9/tests/visual.c  | 4 +++-
 dlls/wined3d/adapter_gl.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 20df3d29b1b..0edcd5caf22 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -26810,7 +26810,7 @@ static void test_draw_mapped_buffer(void)
         hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, sizeof(quad[0]));
         ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);

-        hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0);
+//        hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0);
         ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
         hr = IDirect3DDevice9_BeginScene(device);
         ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
@@ -28143,6 +28143,8 @@ START_TEST(visual)

IDirect3D9_Release(d3d);

+    test_draw_mapped_buffer(); return;
+
     test_sanity();
     depth_clamp_test();
     stretchrect_test();
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
index bc9da1f0881..9e30e42a021 100644
--- a/dlls/wined3d/adapter_gl.c
+++ b/dlls/wined3d/adapter_gl.c
@@ -5337,7 +5337,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl,
         return FALSE;
     }

-    if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20))
+    if (gl_info->glsl_version < MAKEDWORD_VERSION(1, 20))
     {
         ERR("GLSL version %s is too low; 1.20 is required.\n",
                 (const char *)gl_info->gl_ops.gl.p_glGetString(GL_SHADING_LANGUAGE_VERSION_ARB));

[PATCH 1/1] wined3d: Fix GLSL version comparison.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=145263

Your paranoid android.

=== w8 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w8adm (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w864 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064v1507 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064v1809 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064_tsign (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w10pro64 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w10pro64_en_AE_u8 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w11pro64 (32 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w864 (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064v1507 (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064v1809 (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064_2qxl (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064_adm (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w1064_tsign (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w10pro64 (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w10pro64_ar (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w10pro64_ja (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w10pro64_zh_CN (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== w11pro64_amd (64 bit report) ===

d3d9:
visual.c:26838: Test failed: Got unexpected color 0x00000000, test 0.
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit ar:MA report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit de report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit fr report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit he:IL report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit hi:IN report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit ja:JP report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11 (32 bit zh:CN report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11b (32 bit WoW report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.

=== debian11b (64 bit WoW report) ===

d3d9:
visual.c:26840: Test failed: Got unexpected color 0x00000000, test 0.