=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Disable all clip distances for blits.

Alexandre Julliard julliard at winehq.org
Mon Dec 4 14:58:18 CST 2017


Module: wine
Branch: master
Commit: 46f0b1674fcfe08fe92c2922fd277516ad8392bc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=46f0b1674fcfe08fe92c2922fd277516ad8392bc

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Sat Dec  2 10:24:41 2017 +0100

wined3d: Disable all clip distances for blits.

GL_CLIP_PLANE0 and GL_CLIP_DISTANCE0 has the same value.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/context.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c
index ba9e19c..3dc6ca7 100644
--- a/dlls/wined3d/context.c
+++ b/dlls/wined3d/context.c
@@ -2530,12 +2530,9 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con
     context->last_was_rhw = TRUE;
     context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */
 
-    gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE0); checkGLcall("glDisable(clip plane 0)");
-    gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE1); checkGLcall("glDisable(clip plane 1)");
-    gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE2); checkGLcall("glDisable(clip plane 2)");
-    gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE3); checkGLcall("glDisable(clip plane 3)");
-    gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE4); checkGLcall("glDisable(clip plane 4)");
-    gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE5); checkGLcall("glDisable(clip plane 5)");
+    for (i = 0; i < gl_info->limits.user_clip_distances; ++i)
+        gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i);
+    checkGLcall("disable clip planes");
     context_invalidate_state(context, STATE_RENDER(WINED3D_RS_CLIPPING));
 
     /* FIXME: Make draw_textured_quad() able to work with a upper left origin. */




More information about the wine-cvs mailing list