Fixed conform feedback and drawelements tests.

Use correct pv when rasterizing unfilled polys.

3 files changed, 5 insertions, 8 deletions

diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 4d6941a576..b67e8146c3 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,4 +1,4 @@
-/* $Id: feedback.c,v 1.19 2001/01/08 04:09:41 keithw Exp $ */
+/* $Id: feedback.c,v 1.20 2001/01/14 06:14:21 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -58,14 +58,13 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
       gl_error( ctx, GL_INVALID_OPERATION, "glFeedbackBuffer" );
       return;
    }
-
    if (size<0) {
       gl_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(size<0)" );
       return;
    }
    if (!buffer) {
       gl_error( ctx, GL_INVALID_VALUE, "glFeedbackBuffer(buffer==NULL)" );
-      ctx->Feedback.BufferSize = 0; /* XXX -- Sould this be here??? */
+      ctx->Feedback.BufferSize = 0; 
       return;
    }
 
@@ -103,7 +102,6 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 }
 
 
-
 void
 _mesa_PassThrough( GLfloat token )
 {
@@ -153,6 +151,7 @@ void gl_feedback_vertex( GLcontext *ctx,
    }
 }
 
+
 /**********************************************************************/
 /*                              Selection                             */
 /**********************************************************************/
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index 8a9256c178..520010c1a1 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -1,4 +1,4 @@
-/* $Id: lines.c,v 1.26 2001/01/13 05:48:25 keithw Exp $ */
+/* $Id: lines.c,v 1.27 2001/01/14 06:14:21 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -31,7 +31,6 @@
 #include "glheader.h"
 #include "context.h"
 #include "depth.h"
-#include "feedback.h"
 #include "lines.h"
 #include "macros.h"
 #include "mmath.h"
diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c
index c24b1b4eef..41788352a1 100644
--- a/src/mesa/main/points.c
+++ b/src/mesa/main/points.c
@@ -1,4 +1,4 @@
-/* $Id: points.c,v 1.27 2001/01/09 00:02:55 brianp Exp $ */
+/* $Id: points.c,v 1.28 2001/01/14 06:14:21 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -30,7 +30,6 @@
 #else
 #include "glheader.h"
 #include "context.h"
-#include "feedback.h"
 #include "macros.h"
 #include "mmath.h"
 #include "points.h"