From 306d3fcdbad523428501833405e47e9897896def Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Tue, 9 Apr 2002 16:56:50 +0000
Subject: bring in changes from dri tcl branch

---
 src/mesa/tnl/t_vb_vertex.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/mesa/tnl/t_vb_vertex.c')

diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index 4369df16f6..e13b8bc0a1 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_vertex.c,v 1.13 2002/03/29 17:27:59 brianp Exp $ */
+/* $Id: t_vb_vertex.c,v 1.14 2002/04/09 16:56:52 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -140,7 +140,8 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
    if (stage->changed_inputs) {
 
       if (ctx->_NeedEyeCoords) {
-	 /* Separate modelview and project transformations:
+	 /* Separate modelview transformation:
+	  * Use combined ModelProject to avoid some depth artifacts
 	  */
 	 if (ctx->ModelviewMatrixStack.Top->type == MATRIX_IDENTITY)
 	    VB->EyePtr = VB->ObjPtr;
@@ -153,8 +154,8 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
 	    VB->ClipPtr = VB->EyePtr;
 	 else
 	    VB->ClipPtr = TransformRaw( &store->clip,
-                                        ctx->ProjectionMatrixStack.Top,
-					VB->EyePtr );
+                                        &ctx->_ModelProjectMatrix,
+					VB->ObjPtr );
       }
       else {
 	 /* Combined modelviewproject transform:
-- 
cgit v1.2.3