Added ctx parameter to _mesa_debug()

Added _mesa_printf()
Updated SetDrawBuffer() function in all drivers (ala 4.0.3)
Import 4.0.3/DRI changes.

1 files changed, 27 insertions, 23 deletions

diff --git a/src/mesa/swrast_setup/ss_vb.c b/src/mesa/swrast_setup/ss_vb.c
index 5a10afeae3..b47508b6f6 100644
--- a/src/mesa/swrast_setup/ss_vb.c
+++ b/src/mesa/swrast_setup/ss_vb.c
@@ -1,10 +1,10 @@
-/* $Id: ss_vb.c,v 1.17 2002/06/13 04:49:17 brianp Exp $ */
+/* $Id: ss_vb.c,v 1.18 2002/06/15 02:38:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  4.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -29,6 +29,7 @@
 
 #include "glheader.h"
 #include "colormac.h"
+#include "context.h"
 #include "macros.h"
 #include "mem.h"
 
@@ -291,33 +292,32 @@ static void copy_pv_extras( GLcontext *ctx, GLuint dst, GLuint src )
  *                         Initialization 
  ***********************************************************************/
 
-
-
-
-
 static void
 emit_invalid( GLcontext *ctx, GLuint start, GLuint end, GLuint newinputs )
 {
-   _mesa_debug("swrast_setup: invalid setup function\n");
+   _mesa_debug(ctx, "swrast_setup: invalid setup function\n");
    (void) (ctx && start && end && newinputs);
 }
 
+
 static void 
 interp_invalid( GLcontext *ctx, GLfloat t,
 		GLuint edst, GLuint eout, GLuint ein,
 		GLboolean force_boundary )
 {
-   _mesa_debug("swrast_setup: invalid interp function\n");
+   _mesa_debug(ctx, "swrast_setup: invalid interp function\n");
    (void) (ctx && t && edst && eout && ein && force_boundary);
 }
 
+
 static void 
 copy_pv_invalid( GLcontext *ctx, GLuint edst, GLuint esrc )
 {
-   _mesa_debug("swrast_setup: invalid copy_pv function\n");
+   _mesa_debug(ctx, "swrast_setup: invalid copy_pv function\n");
    (void) (ctx && edst && esrc );
 }
 
+
 static void init_standard( void )
 {
    GLuint i;
@@ -359,22 +359,24 @@ static void init_standard( void )
    init_index_fog_point();
 }
 
-static void printSetupFlags(char *msg, GLuint flags )
+
+/* debug only */
+static void
+printSetupFlags(const GLcontext *ctx, char *msg, GLuint flags )
 {
-   _mesa_debug("%s(%x): %s%s%s%s%s%s%s\n",
-	   msg,
-	   (int)flags,
-	   (flags & COLOR) ? "color, " : "",
-	   (flags & INDEX) ? "index, " : "",
-	   (flags & TEX0) ? "tex0, " : "",
-	   (flags & MULTITEX) ? "multitex, " : "",
-	   (flags & SPEC) ? "spec, " : "",
-	   (flags & FOG) ? "fog, " : "",
-	   (flags & POINT) ? "point, " : "");
+   _mesa_debug(ctx, "%s(%x): %s%s%s%s%s%s%s\n",
+               msg,
+               (int) flags,
+               (flags & COLOR) ? "color, " : "",
+               (flags & INDEX) ? "index, " : "",
+               (flags & TEX0) ? "tex0, " : "",
+               (flags & MULTITEX) ? "multitex, " : "",
+               (flags & SPEC) ? "spec, " : "",
+               (flags & FOG) ? "fog, " : "",
+               (flags & POINT) ? "point, " : "");
 }
 
 
-
 void
 _swsetup_choose_rastersetup_func(GLcontext *ctx)
 {
@@ -436,6 +438,8 @@ _swsetup_vb_init( GLcontext *ctx )
 {
    (void) ctx;
    init_standard();
-   (void) printSetupFlags;
+   /*
+   printSetupFlags(ctx);
+   */
 }