mesa: prefix a bunch of #include lines with "main/".

This is another step toward removing a whole bunch of -I flags from
the cc commands.  Still need to address driver code...

src/mesa/drivers/common/driverfuncs.c

@@ -23,35 +23,36 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "arrayobj.h"
+#include "main/arrayobj.h"
-#include "buffers.h"
+#include "main/buffers.h"
-#include "context.h"
+#include "main/context.h"
-#include "framebuffer.h"
+#include "main/framebuffer.h"
-#include "mipmap.h"
+#include "main/mipmap.h"
-#include "queryobj.h"
+#include "main/queryobj.h"
-#include "renderbuffer.h"
+#include "main/renderbuffer.h"
-#include "texcompress.h"
+#include "main/texcompress.h"
-#include "texformat.h"
+#include "main/texformat.h"
-#include "teximage.h"
+#include "main/teximage.h"
-#include "texobj.h"
+#include "main/texobj.h"
-#include "texstore.h"
+#include "main/texstore.h"
 #if FEATURE_ARB_vertex_buffer_object
-#include "bufferobj.h"
+#include "main/bufferobj.h"
 #endif
 #if FEATURE_EXT_framebuffer_object
-#include "fbobject.h"
+#include "main/fbobject.h"
-#include "texrender.h"
+#include "main/texrender.h"
 #endif
 
 #include "shader/program.h"
 #include "shader/prog_execute.h"
 #include "shader/shader_api.h"
-#include "driverfuncs.h"
 #include "tnl/tnl.h"
 #include "swrast/swrast.h"
 
+#include "driverfuncs.h"
+
 
 
 /**

src/mesa/glapi/glapi.c

@@ -57,7 +57,7 @@
 
 #else
 
-#include "glheader.h"
+#include "main/glheader.h"
 
 #endif
 

src/mesa/main/dispatch.c

@@ -39,10 +39,10 @@
 
 #ifndef GLX_USE_APPLEGL
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "glapi.h"
+#include "glapi/glapi.h"
-#include "glapitable.h"
+#include "glapi/glapitable.h"
-#include "glthread.h"
+#include "glapi/glthread.h"
 
 
 #if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
@@ -87,8 +87,8 @@
 #define GLAPIENTRY
 #endif
 
-#include "dispatch.h"
+#include "glapi/dispatch.h"
-#include "glapitemp.h"
+#include "glapi/glapitemp.h"
 
 #endif /* USE_X86_ASM */
 

src/mesa/math/m_debug_clip.c

@@ -25,10 +25,10 @@
  *    Gareth Hughes
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"

src/mesa/math/m_debug_norm.c

@@ -26,10 +26,10 @@
  *    Gareth Hughes
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"

src/mesa/math/m_debug_xform.c

@@ -26,10 +26,10 @@
  * Updated for P6 architecture by Gareth Hughes.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 #include "m_xform.h"

src/mesa/math/m_matrix.c

@@ -34,10 +34,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_matrix.h"
 

src/mesa/math/m_translate.c

@@ -28,9 +28,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "mtypes.h"		/* GLchan hack */
+#include "main/mtypes.h"		/* GLchan hack */
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "m_translate.h"
 

src/mesa/math/m_vector.c

@@ -28,10 +28,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "m_vector.h"
 

src/mesa/math/m_vector.h

@@ -1,9 +1,8 @@
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.3
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  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"),
@@ -31,8 +30,8 @@
 #ifndef _M_VECTOR_H_
 #define _M_VECTOR_H_
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "mtypes.h"		/* hack for GLchan */
+#include "main/mtypes.h"		/* hack for GLchan */
 
 
 #define VEC_DIRTY_0        0x1

src/mesa/math/m_xform.h

@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5.1
+ * Version:  7.3
  *
- * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  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"),
@@ -27,8 +27,8 @@
 #define _M_XFORM_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "config.h"
+#include "main/config.h"
 #include "math/m_vector.h"
 #include "math/m_matrix.h"
 

src/mesa/ppc/common_ppc.c

@@ -38,6 +38,9 @@
 #include <elf.h>
 #endif
 
+#include "common_ppc_features.h"
+
+
 unsigned long _mesa_ppc_cpu_features = 0;
 
 /**

src/mesa/ppc/common_ppc_features.h

@@ -48,4 +48,7 @@ extern unsigned long _mesa_ppc_cpu_features;
 #define cpu_has_fpu ((_mesa_ppc_cpu_features & PPC_FEATURE_HAS_FPU) != 0)
 
 #endif /* USE_PPC_ASM */
+
+extern void _mesa_init_all_ppc_transform_asm( void );
+
 #endif /* COMMON_PPC_FEATURES_H */

src/mesa/shader/arbprogparse.c

@@ -32,14 +32,14 @@
 
 #include "main/glheader.h"
 #include "main/imports.h"
+#include "main/context.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
 #include "shader/grammar/grammar_mesa.h"
 #include "arbprogparse.h"
 #include "program.h"
 #include "prog_parameter.h"
 #include "prog_statevars.h"
-#include "context.h"
-#include "macros.h"
-#include "mtypes.h"
 #include "prog_instruction.h"
 
 

src/mesa/shader/arbprogparse.h

@@ -26,7 +26,7 @@
 #ifndef ARBPROGPARSE_H
 #define ARBPROGPARSE_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 extern void
 _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,

src/mesa/shader/arbprogram.c

@@ -29,14 +29,14 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
+#include "main/context.h"
+#include "main/hash.h"
+#include "main/imports.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
 #include "arbprogram.h"
 #include "arbprogparse.h"
-#include "context.h"
-#include "hash.h"
-#include "imports.h"
-#include "macros.h"
-#include "mtypes.h"
 #include "program.h"
 
 

src/mesa/shader/atifragshader.c

@@ -21,13 +21,13 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "enums.h"
+#include "main/enums.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "atifragshader.h"
 
 #define MESA_DEBUG_ATI_FS 0

src/mesa/shader/grammar/grammar_mesa.h

@@ -26,7 +26,7 @@
 #define GRAMMAR_MESA_H
 
 
-#include "imports.h"
+#include "main/imports.h"
 /* NOTE: include Mesa 3-D specific headers here */
 
 

src/mesa/shader/nvfragparse.c

@@ -37,14 +37,14 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
+#include "program.h"
 #include "prog_parameter.h"
 #include "prog_instruction.h"
 #include "nvfragparse.h"
-#include "program.h"
 
 
 #define INPUT_1V     1

src/mesa/shader/nvprogram.c

@@ -37,17 +37,17 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
+#include "program.h"
 #include "prog_parameter.h"
 #include "prog_instruction.h"
 #include "nvfragparse.h"
 #include "nvvertparse.h"
 #include "nvprogram.h"
-#include "program.h"
 
 
 

src/mesa/shader/nvvertparse.c

@@ -37,10 +37,10 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "nvprogram.h"
 #include "nvvertparse.h"
 #include "prog_instruction.h"

src/mesa/shader/prog_debug.c

@@ -23,9 +23,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "nvfragparse.h"
 #include "nvvertparse.h"
 #include "program.h"

src/mesa/shader/prog_execute.c

@@ -35,9 +35,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
 #include "program.h"
 #include "prog_execute.h"
 #include "prog_instruction.h"

src/mesa/shader/prog_instruction.c

@@ -23,9 +23,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "prog_instruction.h"
 
 

src/mesa/shader/prog_print.c

@@ -28,9 +28,9 @@
  * \author Brian Paul
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "prog_instruction.h"
 #include "prog_parameter.h"
 #include "prog_print.h"

src/mesa/shader/prog_statevars.c

@@ -29,12 +29,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "prog_statevars.h"
 #include "prog_parameter.h"
 #include "nvvertparse.h"

src/mesa/shader/prog_statevars.h

@@ -25,7 +25,7 @@
 #ifndef PROG_STATEVARS_H
 #define PROG_STATEVARS_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 /**

src/mesa/shader/program.c

@@ -29,9 +29,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
 #include "program.h"
 #include "prog_parameter.h"
 #include "prog_instruction.h"

src/mesa/shader/program.h

@@ -40,7 +40,7 @@
 #ifndef PROGRAM_H
 #define PROGRAM_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 extern struct gl_program _mesa_DummyProgram;

src/mesa/shader/shader_api.c

@@ -35,15 +35,15 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "hash.h"
+#include "main/hash.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "program.h"
+#include "shader/program.h"
-#include "prog_parameter.h"
+#include "shader/prog_parameter.h"
-#include "prog_print.h"
+#include "shader/prog_print.h"
-#include "prog_statevars.h"
+#include "shader/prog_statevars.h"
-#include "prog_uniform.h"
+#include "shader/prog_uniform.h"
 #include "shader/shader_api.h"
 #include "shader/slang/slang_compile.h"
 #include "shader/slang/slang_link.h"

src/mesa/shader/shader_api.h

@@ -27,8 +27,8 @@
 #define SHADER_API_H
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 /**

src/mesa/sources

@@ -281,6 +281,9 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 
 ### Include directories
+### XXX we should be able to trim this down to just -Iinclude/ and -Isrc/mesa/
+### since most #includes have been changed from #include "mtypes.h" to
+### #include "main/mtypes.h", etc.
 
 INCLUDE_DIRS = \
 	-I$(TOP)/include \

src/mesa/swrast/s_aaline.c

@@ -23,14 +23,14 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
+#include "main/mtypes.h"
 #include "swrast/s_aaline.h"
 #include "swrast/s_context.h"
 #include "swrast/s_span.h"
 #include "swrast/swrast.h"
-#include "mtypes.h"
 
 
 #define SUB_PIXEL 4

src/mesa/swrast/s_aaline.h

@@ -28,7 +28,6 @@
 #define S_AALINE_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_aatriangle.c

@@ -28,12 +28,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "s_aatriangle.h"
 #include "s_context.h"
 #include "s_span.h"

src/mesa/swrast/s_aatriangle.h

@@ -28,7 +28,6 @@
 #define S_AATRIANGLE_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_accum.c

@@ -23,11 +23,11 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "fbobject.h"
+#include "main/fbobject.h"
 
 #include "s_accum.h"
 #include "s_context.h"

src/mesa/swrast/s_accum.h

@@ -27,7 +27,7 @@
 #define S_ACCUM_H
 
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 
 extern void

src/mesa/swrast/s_alpha.c

@@ -27,10 +27,10 @@
  * \brief Functions to apply alpha test.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_alpha.h"
 #include "s_context.h"

src/mesa/swrast/s_alpha.h

@@ -28,7 +28,6 @@
 #define S_ALPHA_H
 
 
-#include "mtypes.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_atifragshader.c

@@ -1,5 +1,4 @@
 /*
- *
  * Copyright (C) 2004  David Airlie   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -20,10 +19,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "shader/program.h"
 #include "shader/atifragshader.h"
 #include "swrast/s_atifragshader.h"

src/mesa/swrast/s_bitmap.c

@@ -28,11 +28,11 @@
  * \author Brian Paul
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "bufferobj.h"
+#include "main/bufferobj.h"
-#include "image.h"
+#include "main/image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "pixel.h"
+#include "main/pixel.h"
 
 #include "s_context.h"
 #include "s_span.h"

src/mesa/swrast/s_blend.c

@@ -35,10 +35,10 @@
 
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_blend.h"
 #include "s_context.h"

src/mesa/swrast/s_blend.h

@@ -27,7 +27,6 @@
 #define S_BLEND_H
 
 
-#include "mtypes.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_blit.c

@@ -23,8 +23,8 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_buffers.c

@@ -24,11 +24,11 @@
 
 /** XXX This file should be named s_clear.c */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "s_accum.h"
 #include "s_context.h"

src/mesa/swrast/s_context.c

@@ -26,15 +26,15 @@
  *    Brian Paul
  */
 
-#include "imports.h"
+#include "main/imports.h"
-#include "bufferobj.h"
+#include "main/bufferobj.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "teximage.h"
+#include "main/teximage.h"
-#include "swrast.h"
 #include "shader/prog_parameter.h"
 #include "shader/prog_statevars.h"
+#include "swrast.h"
 #include "s_blend.h"
 #include "s_context.h"
 #include "s_lines.h"

src/mesa/swrast/s_copypix.c

@@ -23,15 +23,15 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "convolve.h"
+#include "main/convolve.h"
-#include "histogram.h"
+#include "main/histogram.h"
-#include "image.h"
+#include "main/image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "pixel.h"
+#include "main/pixel.h"
 
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_depth.c

@@ -23,11 +23,11 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "fbobject.h"
+#include "main/fbobject.h"
 
 #include "s_depth.h"
 #include "s_context.h"

src/mesa/swrast/s_depth.h

@@ -27,7 +27,6 @@
 #define S_DEPTH_H
 
 
-#include "mtypes.h"
 #include "s_context.h"
 
 

src/mesa/swrast/s_drawpix.c

@@ -23,15 +23,15 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "bufferobj.h"
+#include "main/bufferobj.h"
-#include "context.h"
+#include "main/context.h"
-#include "convolve.h"
+#include "main/convolve.h"
-#include "image.h"
+#include "main/image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "pixel.h"
+#include "main/pixel.h"
-#include "state.h"
+#include "main/state.h"
 
 #include "s_context.h"
 #include "s_drawpix.h"

src/mesa/swrast/s_drawpix.h

@@ -28,7 +28,6 @@
 #define S_DRAWPIXELS_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 /* XXX kill this header? */

src/mesa/swrast/s_feedback.c

@@ -22,12 +22,12 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "enums.h"
+#include "main/enums.h"
-#include "feedback.h"
+#include "main/feedback.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_feedback.h"

src/mesa/swrast/s_feedback.h

@@ -28,7 +28,6 @@
 #define S_FEEDBACK_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_fog.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_fog.h"

src/mesa/swrast/s_fog.h

@@ -28,7 +28,6 @@
 #define S_FOG_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_imaging.c

@@ -27,10 +27,11 @@
  * extensions into either swrast or a sister module.  
  */
 
+#include "main/glheader.h"
+#include "main/colortab.h"
+#include "main/convolve.h"
 #include "s_context.h"
 #include "s_span.h"
-#include "colortab.h"
-#include "convolve.h"
 
 
 void

src/mesa/swrast/s_lines.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
 #include "s_aaline.h"
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_lines.h

@@ -27,7 +27,7 @@
 #ifndef S_LINES_H
 #define S_LINES_H
 
-#include "mtypes.h"
+#include "swrast.h"
 
 void
 _swrast_choose_line( GLcontext *ctx );

src/mesa/swrast/s_logic.c

@@ -23,10 +23,10 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_logic.h"

src/mesa/swrast/s_logic.h

@@ -27,7 +27,6 @@
 #define S_LOGIC_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_masking.c

@@ -28,8 +28,8 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
 
 #include "s_context.h"
 #include "s_masking.h"

src/mesa/swrast/s_masking.h

@@ -27,7 +27,6 @@
 #define S_MASKING_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_points.c

@@ -23,11 +23,11 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "texstate.h"
+#include "main/texstate.h"
 #include "s_context.h"
 #include "s_feedback.h"
 #include "s_points.h"

src/mesa/swrast/s_points.h

@@ -27,7 +27,7 @@
 #ifndef S_POINTS_H
 #define S_POINTS_H
 
-#include "mtypes.h"
+#include "swrast.h"
 
 extern void
 _swrast_choose_point( GLcontext *ctx );

src/mesa/swrast/s_readpix.c

@@ -23,17 +23,17 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "bufferobj.h"
+#include "main/bufferobj.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "convolve.h"
+#include "main/convolve.h"
-#include "context.h"
+#include "main/context.h"
-#include "feedback.h"
+#include "main/feedback.h"
-#include "image.h"
+#include "main/image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "pixel.h"
+#include "main/pixel.h"
-#include "state.h"
+#include "main/state.h"
 
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_span.c

@@ -30,12 +30,12 @@
  * \author Brian Paul
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "image.h"
+#include "main/image.h"
 
 #include "s_atifragshader.h"
 #include "s_alpha.h"

src/mesa/swrast/s_span.h

@@ -27,7 +27,6 @@
 #define S_SPAN_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_stencil.c

@@ -23,9 +23,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
 
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_stencil.h

@@ -27,7 +27,6 @@
 #define S_STENCIL_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_texcombine.c

@@ -23,12 +23,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "pixel.h"
+#include "main/pixel.h"
 
 #include "s_context.h"
 #include "s_texcombine.h"

src/mesa/swrast/s_texcombine.h

@@ -27,7 +27,6 @@
 #define S_TEXCOMBINE_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 extern void

src/mesa/swrast/s_texfilter.c

@@ -23,11 +23,11 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "texformat.h"
+#include "main/texformat.h"
 
 #include "s_context.h"
 #include "s_texfilter.h"

src/mesa/swrast/s_texfilter.h

@@ -27,7 +27,6 @@
 #define S_TEXFILTER_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_texstore.c

@@ -36,17 +36,17 @@
 
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "convolve.h"
+#include "main/convolve.h"
-#include "image.h"
+#include "main/image.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mipmap.h"
+#include "main/mipmap.h"
-#include "texformat.h"
+#include "main/texformat.h"
-#include "teximage.h"
+#include "main/teximage.h"
-#include "texstore.h"
+#include "main/texstore.h"
 
 #include "s_context.h"
 #include "s_depth.h"

src/mesa/swrast/s_triangle.c

@@ -29,12 +29,12 @@
  * functions to draw triangles.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "texformat.h"
+#include "main/texformat.h"
 
 #include "s_aatriangle.h"
 #include "s_context.h"

src/mesa/swrast/s_triangle.h

@@ -28,7 +28,6 @@
 #define S_TRIANGLES_H
 
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast/s_zoom.c

@@ -22,10 +22,10 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "s_context.h"
 #include "s_span.h"

src/mesa/swrast/s_zoom.h

@@ -25,7 +25,6 @@
 #ifndef S_ZOOM_H
 #define S_ZOOM_H
 
-#include "mtypes.h"
 #include "swrast.h"
 
 

src/mesa/swrast_setup/ss_context.c

@@ -25,16 +25,17 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "ss_context.h"
-#include "ss_triangle.h"
-#include "swrast_setup.h"
 #include "tnl/tnl.h"
 #include "tnl/t_context.h"
 #include "tnl/t_pipeline.h"
 #include "tnl/t_vertex.h"
+#include "swrast_setup.h"
+#include "ss_context.h"
+#include "ss_triangle.h"
+
 
 /* Need to check lighting state and vertex program state to know
  * if two-sided lighting is in effect.

src/mesa/swrast_setup/ss_context.h

@@ -28,7 +28,7 @@
 #ifndef SS_CONTEXT_H
 #define SS_CONTEXT_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast/swrast.h"
 #include "swrast_setup.h"
 #include "tnl/t_context.h"

src/mesa/swrast_setup/ss_triangle.c

@@ -25,10 +25,10 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "tnl/t_context.h"
 

src/mesa/swrast_setup/ss_triangle.h

@@ -29,7 +29,6 @@
 #ifndef SS_TRIANGLE_H
 #define SS_TRIANGLE_H
 
-#include "mtypes.h"
 #include "ss_context.h"
 
 

src/mesa/tnl/t_draw.c

@@ -25,13 +25,13 @@
  *    Keith Whitwell <keith@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "state.h"
+#include "main/state.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "enums.h"
+#include "main/enums.h"
 
 #include "t_context.h"
 #include "t_pipeline.h"

src/mesa/tnl/t_pipeline.h

@@ -30,7 +30,7 @@
 #ifndef _T_PIPELINE_H_
 #define _T_PIPELINE_H_
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "t_context.h"
 
 extern void _tnl_run_pipeline( GLcontext *ctx );

src/mesa/tnl/t_vb_cull.c

@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 

src/mesa/tnl/t_vb_fog.c

@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 

src/mesa/tnl/t_vb_light.c

@@ -24,13 +24,13 @@
 
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "light.h"
+#include "main/light.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "simple_list.h"
+#include "main/simple_list.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_translate.h"
 

src/mesa/tnl/t_vb_normals.c

@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 

src/mesa/tnl/t_vb_points.c

@@ -25,8 +25,8 @@
  *    Brian Paul
  */
 
-#include "mtypes.h"
+#include "main/mtypes.h"
-#include "imports.h"
+#include "main/imports.h"
 #include "t_context.h"
 #include "t_pipeline.h"
 

src/mesa/tnl/t_vb_render.c

@@ -38,12 +38,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "enums.h"
+#include "main/enums.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "t_pipeline.h"
 

src/mesa/tnl/t_vb_texgen.c

@@ -35,12 +35,12 @@
  * including any use thereof or modifications thereto.
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 

src/mesa/tnl/t_vb_texmat.c

@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 

src/mesa/tnl/t_vb_vertex.c

@@ -26,12 +26,12 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "colormac.h"
+#include "main/colormac.h"
-#include "context.h"
+#include "main/context.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "imports.h"
+#include "main/imports.h"
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #include "math/m_xform.h"
 

src/mesa/tnl/t_vertex.c

@@ -25,9 +25,9 @@
  *    Keith Whitwell <keithw@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
 
 #include "t_context.h"
 #include "t_vertex.h"

src/mesa/tnl/t_vertex.h

@@ -28,7 +28,7 @@
 #ifndef _TNL_VERTEX_H
 #define _TNL_VERTEX_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "t_context.h"
 
 /* New mechanism to specify hardware vertices so that tnl can build

src/mesa/tnl/t_vertex_generic.c

@@ -26,12 +26,12 @@
  *    Keith Whitwell <keithw@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
+#include "main/simple_list.h"
 #include "t_context.h"
 #include "t_vertex.h"
-#include "simple_list.h"
 
 
 

src/mesa/tnl/t_vertex_sse.c

@@ -25,13 +25,13 @@
  *    Keith Whitwell <keithw@tungstengraphics.com>
  */
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "context.h"
+#include "main/context.h"
-#include "colormac.h"
+#include "main/colormac.h"
+#include "main/simple_list.h"
+#include "main/enums.h"
 #include "t_context.h"
 #include "t_vertex.h"
-#include "simple_list.h"
-#include "enums.h"
 
 #if defined(USE_SSE_ASM)
 

src/mesa/tnl/t_vp_build.c

@@ -30,9 +30,9 @@
  */
 
 
-#include "glheader.h"
+#include "main/glheader.h"
-#include "macros.h"
+#include "main/macros.h"
-#include "enums.h"
+#include "main/enums.h"
 #include "shader/program.h"
 #include "shader/prog_instruction.h"
 #include "shader/prog_parameter.h"

src/mesa/tnl/t_vp_build.h

@@ -26,7 +26,7 @@
 #ifndef _T_ARB_BUILD_H
 #define _T_ARB_BUILD_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );