diff options
| -rw-r--r-- | src/mesa/main/context.c | 11 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 13 |
2 files changed, 3 insertions, 21 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 7cfcedf780d..ce3514213b4 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -102,6 +102,9 @@ #include "pixel.h" #include "points.h" #include "polygon.h" +#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program +#include "program.h" +#endif #include "rastpos.h" #include "simple_list.h" #include "state.h" @@ -111,9 +114,6 @@ #include "texstate.h" #include "mtypes.h" #include "varray.h" -#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program -#include "program.h" -#endif #include "vtxfmt.h" #if _HAVE_FULL_GL #include "math/m_translate.h" @@ -122,11 +122,6 @@ #include "math/mathmod.h" #endif -#if defined(MESA_TRACE) -#include "Trace/tr_context.h" -#include "Trace/tr_wrapper.h" -#endif - #ifdef USE_SPARC_ASM #include "SPARC/sparc.h" #endif diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 9e21d953849..9a5bec693e6 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -39,13 +39,8 @@ #include "config.h" /* Hardwired parameters */ #include "glapitable.h" #include "glthread.h" - #include "math/m_matrix.h" /* GLmatrix */ -#if defined(MESA_TRACE) -#include "Trace/tr_context.h" -#endif - /** * Color channel data type. @@ -2220,14 +2215,6 @@ struct __GLcontextRec { /** Dither disable via MESA_NO_DITHER env var */ GLboolean NoDither; -#if defined(MESA_TRACE) - struct _glapi_table *TraceDispatch; - trace_context_t *TraceCtx; -#else - void *TraceDispatch; - void *TraceCtx; -#endif - /** Core tnl module support */ struct gl_tnl_module TnlModule; |