* Fixups to the GGIMesa code to reflect the recent DD API changes

* Added a new GGIMesa debugging-print subsystem

2 files changed, 258 insertions, 2 deletions

diff --git a/src/mesa/drivers/ggi/include/ggi/mesa/debug.h b/src/mesa/drivers/ggi/include/ggi/mesa/debug.h
index d14c6e4a1d..b07a8ad9a7 100644
--- a/src/mesa/drivers/ggi/include/ggi/mesa/debug.h
+++ b/src/mesa/drivers/ggi/include/ggi/mesa/debug.h
@@ -1 +1,257 @@
-/* Nothing here yet */
+/* $Id: debug.h,v 1.2 2000/01/07 08:34:44 jtaylor Exp $
+******************************************************************************
+
+   GGIMesa debugging macros
+
+   Copyright (C) 1998-1999 Marcus Sundberg	[marcus@ggi-project.org]
+   Copyright (C) 1999-2000 Jon Taylor		[taylorj@ggi-project.org]
+  
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#ifndef _GGI_MESA_INTERNAL_DEBUG_H
+#define _GGI_MESA_INTERNAL_DEBUG_H
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <ggi/types.h>
+#include <ggi/gg.h>
+
+
+__BEGIN_DECLS
+
+/* Exported variables */
+#ifdef BUILDING_GGIMESA
+extern uint32     _ggimesaDebugState;
+extern int        _ggimesaDebugSync;
+#else
+IMPORTVAR uint32  _ggimesaDebugState;
+IMPORTVAR int     _ggimesaDebugSync;
+#endif
+
+__END_DECLS
+
+
+/* Debugging types
+ * bit 0 is reserved! */
+
+#define GGIMESADEBUG_CORE		(1<<1)	/*   2 */
+#define GGIMESADEBUG_MODE		(1<<2)	/*   4 */
+#define GGIMESADEBUG_COLOR		(1<<3)	/*   8 */
+#define GGIMESADEBUG_DRAW		(1<<4)	/*  16 */
+#define GGIMESADEBUG_MISC		(1<<5)	/*  32 */
+#define GGIMESADEBUG_LIBS		(1<<6)	/*  64 */
+#define GGIMESADEBUG_EVENTS		(1<<7)	/* 128 */
+
+#define GGIMESADEBUG_ALL	0xffffffff
+
+#ifdef __GNUC__
+
+#ifdef DEBUG
+#define GGIMESADPRINT(form,args...)	   if (_ggimesaDebugState) { ggDPrintf(_ggimesaDebugSync, "GGIMesa",form, ##args); }
+#define GGIMESADPRINT_CORE(form,args...)   if (_ggimesaDebugState & GGIMESADEBUG_CORE) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#define GGIMESADPRINT_MODE(form,args...)   if (_ggimesaDebugState & GGIMESADEBUG_MODE) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#define GGIMESADPRINT_COLOR(form,args...)  if (_ggimesaDebugState & GGIMESADEBUG_COLOR) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#define GGIMESADPRINT_DRAW(form,args...)   if (_ggimesaDebugState & GGIMESADEBUG_DRAW) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#define GGIMESADPRINT_MISC(form,args...)   if (_ggimesaDebugState & GGIMESADEBUG_MISC) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#define GGIMESADPRINT_LIBS(form,args...)   if (_ggimesaDebugState & GGIMESADEBUG_LIBS) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#define GGIMESADPRINT_EVENTS(form,args...) if (_ggimesaDebugState & GGIMESADEBUG_EVENTS) { ggDPrintf(_ggimesaDebugSync,"GGIMesa",form, ##args); }
+#else /* DEBUG */
+#define GGIMESADPRINT(form,args...)		do{}while(0)
+#define GGIMESADPRINT_CORE(form,args...)	do{}while(0)
+#define GGIMESADPRINT_MODE(form,args...)	do{}while(0)
+#define GGIMESADPRINT_COLOR(form,args...)	do{}while(0)
+#define GGIMESADPRINT_DRAW(form,args...)	do{}while(0)
+#define GGIMESADPRINT_MISC(form,args...)	do{}while(0)
+#define GGIMESADPRINT_LIBS(form,args...)	do{}while(0)
+#define GGIMESADPRINT_EVENTS(form,args...)	do{}while(0)
+#endif /* DEBUG */
+
+#else /* __GNUC__ */
+
+__BEGIN_DECLS
+
+static inline void GGIMESADPRINT(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_CORE(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_CORE) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_MODE(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_MODE) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_COLOR(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_COLOR) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_DRAW(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_DRAW) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_MISC(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_MISC) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_LIBS(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_LIBS) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+static inline void GGIMESADPRINT_EVENTS(const char *form,...)
+{
+#ifdef DEBUG
+	if (_ggiDebugState & GGIDEBUG_EVENTS) {
+		va_list args;
+
+		fprintf(stderr, "GGIMesa: ");
+		va_start(args, form);
+		vfprintf(stderr, form, args);
+		va_end(args);
+		if (_ggimesaDebugSync) fflush(stderr);
+	}
+#endif
+}
+
+__END_DECLS
+
+#endif /* __GNUC__ */
+
+#ifdef DEBUG
+#define GGIMESA_ASSERT(x,str) \
+{ if (!(x)) { \
+	fprintf(stderr,"GGIMESA:%s:%d: INTERNAL ERROR: %s\n",__FILE__,__LINE__,str); \
+	exit(1); \
+} }
+#define GGIMESA_APPASSERT(x,str) \
+{ if (!(x)) { \
+	fprintf(stderr,"GGIMESA:%s:%d: APPLICATION ERROR: %s\n",__FILE__,__LINE__,str); \
+	exit(1); \
+} }
+#else /* DEBUG */
+#define GGIMESA_ASSERT(x,str)	do{}while(0)
+#define GGIMESA_APPASSERT(x,str)	do{}while(0)
+#endif /* DEBUG */
+
+#ifdef DEBUG
+# define GGIMESAD0(x)	x
+#else
+# define GGIMESAD0(x)	/* empty */
+#endif
+
+#ifdef GGIMESADLEV
+# if GGIMESADLEV == 1
+#  define GGIMESAD1(x)	x
+#  define GGIMESAD2(x)	/* empty */
+#  define GGIMESAD3(x)	/* empty */
+# elif GGIMESADLEV == 2
+#  define GGIMESAD1(x)	x
+#  define GGIMESAD2(x)	x
+#  define GGIMESAD3(x)	/* empty */
+# elif GGIMESADLEV > 2
+#  define GGIMESAD1(x)	x
+#  define GGIMESAD2(x)	x
+#  define GGIMESAD3(x)	x
+# endif
+#else
+# define GGIMESAD1(x)	/* empty */
+# define GGIMESAD2(x)	/* empty */
+# define GGIMESAD3(x)	/* empty */
+#endif
+
+#endif /* _GGI_MESA_INTERNAL_DEBUG_H */
diff --git a/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h b/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
index 72d294bb6f..2ee51d1735 100644
--- a/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
+++ b/src/mesa/drivers/ggi/include/ggi/mesa/display_fbdev.h
@@ -14,7 +14,7 @@ struct fbdev_priv_mesa
 	char *accel;
 	int have_accel;
 	void *accelpriv;
-	fbdev_hook *oldpriv;	// Hooks back to the LibGGI fbdev target's private data
+	fbdev_hook *oldpriv;	/* Hooks back to the LibGGI fbdev target's private data */
 };
 
 #endif /* _GGIMESA_DISPLAY_FBDEV_H */