diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2000-09-26 15:27:20 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2000-09-26 15:27:20 +0000 |
| commit | 3b18a36f210da9d66acd1228d24948cd77c2e81e (patch) | |
| tree | dd076b43db8581367121ca67e4d8a3e5b5f3e7fe /src/mesa/main | |
| parent | 63c113a31be2de3a53f38aab622565308d9724b9 (diff) | |
Replaced preprocessor symbol GL_MESA_TRACE with MESA_TRACE.
Changed src/Makefile.X11 to compile Trace sources like other drivers.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/Makefile.X11 | 39 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 6 |
2 files changed, 38 insertions, 7 deletions
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11 index bb383f6554..d4b1b5ba92 100644 --- a/src/mesa/main/Makefile.X11 +++ b/src/mesa/main/Makefile.X11 @@ -1,4 +1,4 @@ -# $Id: Makefile.X11,v 1.22 2000/09/07 15:42:13 brianp Exp $ +# $Id: Makefile.X11,v 1.23 2000/09/26 15:27:23 brianp Exp $ # Mesa 3-D graphics library # Version: 3.5 @@ -132,7 +132,15 @@ DRIVER_SOURCES = \ FX/fxtexman.c \ FX/fxtrifuncs.c \ FX/fxvsetup.c \ - FX/fxglidew.c + FX/fxglidew.c \ + Trace/tr_2string.c \ + Trace/tr_attrib.c \ + Trace/tr_context.c \ + Trace/tr_control.c \ + Trace/tr_error.c \ + Trace/tr_print.c \ + Trace/tr_wrapper.c + ASM_SOURCES = @@ -170,6 +178,7 @@ X/xm_line.o: X/xm_line.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X/xm_tri.o: X/xm_tri.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + SVGA/svgamesa.o: SVGA/svgamesa.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ SVGA/svgamesa8.o: SVGA/svgamesa8.c @@ -182,8 +191,10 @@ SVGA/svgamesa24.o: SVGA/svgamesa24.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ SVGA/svgamesa32.o: SVGA/svgamesa32.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + OSmesa/osmesa.o: OSmesa/osmesa.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + FX/fxapi.o: FX/fxapi.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ FX/fxclip.o: FX/fxclip.c @@ -214,9 +225,9 @@ FX/fxvsetup.o: FX/fxvsetup.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ FX/fxglidew.o: FX/fxglidew.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + FX/X86/fx_3dnow_fastpath.o: FX/X86/fx_3dnow_fastpath.S -GGI/ggimesa.o: GGI/ggimesa.c - $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + X86/x86.o: X86/x86.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ X86/common_x86.o: X86/common_x86.c @@ -226,6 +237,26 @@ X86/3dnow.o: X86/3dnow.c X86/katmai.o: X86/katmai.c $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +GGI/ggimesa.o: GGI/ggimesa.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + +Trace/tr_2string.o: Trace/tr_2string.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +Trace/tr_attrib.o: Trace/tr_attrib.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +Trace/tr_context.o: Trace/tr_context.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +Trace/tr_control.o: Trace/tr_control.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +Trace/tr_error.o: Trace/tr_error.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +Trace/tr_print.o: Trace/tr_print.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ +Trace/tr_wrapper.o: Trace/tr_wrapper.c + $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@ + + + ##### TARGETS ##### #default: diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 71cbc6addc..551327254f 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.88 2000/09/17 21:56:07 brianp Exp $ */ +/* $Id: context.c,v 1.89 2000/09/26 15:27:22 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -74,7 +74,7 @@ #endif -#if defined(GL_MESA_TRACE) +#if defined(MESA_TRACE) #include "Trace/tr_context.h" #include "Trace/tr_wrapper.h" #endif @@ -1491,7 +1491,7 @@ _mesa_initialize_context( GLcontext *ctx, _mesa_init_dlist_table(ctx->Save, dispatchSize); ctx->CurrentDispatch = ctx->Exec; -#if defined(GL_MESA_TRACE) +#if defined(MESA_TRACE) ctx->TraceCtx = CALLOC( sizeof(trace_context_t) ); #if 0 /* Brian: do you want to have CreateContext fail here, |