Commit 89a19317 authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

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: 's avatarJózef Kucia <jkucia@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 829ef414
...@@ -1063,8 +1063,6 @@ static void quirk_broken_arb_fog(struct wined3d_gl_info *gl_info) ...@@ -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) 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]) if (gl_info->supported[ARB_CLIP_CONTROL])
{ {
TRACE("Disabling ARB_clip_control.\n"); TRACE("Disabling ARB_clip_control.\n");
...@@ -4137,8 +4135,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, ...@@ -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); gl_info->gl_ops.gl.p_glGetIntegerv(GL_VIEWPORT_SUBPIXEL_BITS, &subpixel_bits);
TRACE("Viewport supports %d subpixel bits.\n", 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]) if (gl_info->supported[ARB_CLIP_CONTROL] && !gl_info->supported[ARB_VIEWPORT_ARRAY])
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment