wined3d: Disable only ARB_clip_control when ARB_viewport_array cannot be used…

wined3d: Disable only ARB_clip_control when ARB_viewport_array cannot be used for pixel center offsets. We still may want to use ARB_viewport_array, even if only for multiple viewports. Signed-off-by: Józef Kucia <jkucia@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wined3d: Disable only ARB_clip_control when ARB_viewport_array cannot be used…
89a19317 · Józef Kucia · Alexandre Julliard · 829ef414 · 89a19317
Commit 89a19317 authored May 10, 2017 by Józef Kucia Committed by Alexandre Julliard May 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

directx.c dlls/wined3d/directx.c +5 -4

No files found.
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1063,8 +1063,6 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info)
 static void quirk_broken_viewport_subpixel_bits(struct wined3d_gl_info *gl_info)
 {
-    TRACE("Disabling ARB_viewport_array.\n");
-    gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE;
    if (gl_info->supported[ARB_CLIP_CONTROL])
    {
        TRACE("Disabling ARB_clip_control.\n");
@@ -4137,8 +4135,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter,
        gl_info->gl_ops.gl.p_glGetIntegerv(GL_VIEWPORT_SUBPIXEL_BITS, &subpixel_bits);
        TRACE("Viewport supports %d subpixel bits.\n", subpixel_bits);
-        if (subpixel_bits < 8)
+        if (subpixel_bits < 8 && gl_info->supported[ARB_CLIP_CONTROL])
-            gl_info->supported[ARB_VIEWPORT_ARRAY] = FALSE;
+        {
+            TRACE("Disabling ARB_clip_control because viewport subpixel bits < 8.\n");
+            gl_info->supported[ARB_CLIP_CONTROL] = FALSE;
+        }
    }
    if (gl_info->supported[ARB_CLIP_CONTROL] && !gl_info->supported[ARB_VIEWPORT_ARRAY])
    {