Henri Verbeet : wined3d: Apply draw state after depth / stencil setup in drawPrimitive().

Alexandre Julliard julliard at winehq.org
Mon Aug 1 13:22:08 CDT 2011


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Jul 31 17:33:40 2011 +0200

wined3d: Apply draw state after depth / stencil setup in drawPrimitive().

---

 dlls/wined3d/drawprim.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c
index 6133182..5f2198e 100644
--- a/dlls/wined3d/drawprim.c
+++ b/dlls/wined3d/drawprim.c
@@ -608,13 +608,6 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId
         return;
     }
 
-    if (!context_apply_draw_state(context, device))
-    {
-        context_release(context);
-        WARN("Unable to apply draw state, skipping draw.\n");
-        return;
-    }
-
     if (device->fb.depth_stencil)
     {
         /* Note that this depends on the context_acquire() call above to set
@@ -650,6 +643,13 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId
         }
     }
 
+    if (!context_apply_draw_state(context, device))
+    {
+        context_release(context);
+        WARN("Unable to apply draw state, skipping draw.\n");
+        return;
+    }
+
     if ((!context->gl_info->supported[WINED3D_GL_VERSION_2_0]
             || (!glPointParameteri && !context->gl_info->supported[NV_POINT_SPRITE]))
             && context->render_offscreen




More information about the wine-cvs mailing list