diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-01-08 21:55:59 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-01-08 21:55:59 +0000 |
| commit | ce656b6a0a103ae9cb41d509be353f0e661e3574 (patch) | |
| tree | 1f877f14838b85d7db834cb38a040a362db83d6e /src/mesa/main | |
| parent | bfa023921c9d1aa872237e0ac6085160f7c2cbc5 (diff) | |
Fixed 'IRound' to 'IROUND' in mmath.h
Fixed fallback path for drawarrays/_tnl_hard_begin.
Removed disabled debug code.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/Makefile.X11 | 4 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index f1b7698a92..fbf8d20999 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.38 2001/01/05 05:31:42 keithw Exp $ +# $Id: Makefile.X11,v 1.39 2001/01/08 21:55:59 keithw Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -188,8 +188,8 @@ ASM_SOURCES = ADDITIONAL_OBJ = OBJECTS = $(ASM_SOURCES:.S=.o) \ - $(CORE_SOURCES:.c=.o) \ $(DRIVER_SOURCES:.c=.o) \ + $(CORE_SOURCES:.c=.o) \ $(ADDITIONAL_OBJ) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 4cb966f7d2..f3a3a56b0a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1,4 +1,4 @@ -/* $Id: mtypes.h,v 1.12 2001/01/08 04:09:41 keithw Exp $ */ +/* $Id: mtypes.h,v 1.13 2001/01/08 21:55:59 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -1576,13 +1576,14 @@ struct __GLcontextRec { /* Dither disable via MESA_NO_DITHER env var */ GLboolean NoDither; -#ifdef DEBUG GLboolean Rendering; -#endif #if defined(MESA_TRACE) struct _glapi_table *TraceDispatch; trace_context_t *TraceCtx; +#else + void *TraceDispatch; + void *TraceCtx; #endif /* Hooks for module contexts. These will eventually live |