From: Zebediah Figura zfigura@codeweavers.com
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));