mesa: include mtypes.h less

- remove mtypes.h from most header files
- add main/menums.h for often used definitions
- remove main/core.h

v2: fix radv build

Reviewed-by: Brian Paul <brianp@vmware.com>

src/amd/vulkan/radv_pipeline.c

@@ -48,6 +48,7 @@
 #include "util/debug.h"
 #include "ac_exp_param.h"
 #include "ac_shader_util.h"
+#include "main/menums.h"
 
 struct radv_blend_state {
 	uint32_t blend_enable_4bit;

src/amd/vulkan/radv_private.h

@@ -43,6 +43,7 @@
 #define VG(x)
 #endif
 
+#include "c11/threads.h"
 #include <amdgpu.h>
 #include "compiler/shader_enums.h"
 #include "util/macros.h"

src/amd/vulkan/radv_radeon_winsys.h

@@ -29,6 +29,7 @@
 #ifndef RADV_RADEON_WINSYS_H
 #define RADV_RADEON_WINSYS_H
 
+#include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <stdlib.h>

src/amd/vulkan/winsys/amdgpu/radv_amdgpu_bo.c

@@ -33,6 +33,8 @@
 #include <amdgpu.h>
 #include <amdgpu_drm.h>
 #include <inttypes.h>
+#include <pthread.h>
+#include <unistd.h>
 
 #include "util/u_atomic.h"
 

src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c

@@ -26,6 +26,8 @@
 #include <amdgpu.h>
 #include <amdgpu_drm.h>
 #include <assert.h>
+#include <pthread.h>
+#include <errno.h>
 
 #include "ac_debug.h"
 #include "radv_radeon_winsys.h"

src/compiler/glsl/ast_function.cpp

@@ -25,7 +25,7 @@
 #include "ast.h"
 #include "compiler/glsl_types.h"
 #include "ir.h"
-#include "main/core.h" /* for MIN2 */
+#include "main/mtypes.h"
 #include "main/shaderobj.h"
 #include "builtin_functions.h"
 

src/compiler/glsl/ast_to_hir.cpp

@@ -54,6 +54,7 @@
 #include "ast.h"
 #include "compiler/glsl_types.h"
 #include "util/hash_table.h"
+#include "main/mtypes.h"
 #include "main/macros.h"
 #include "main/shaderobj.h"
 #include "ir.h"

src/compiler/glsl/builtin_functions.cpp

@@ -75,7 +75,7 @@
 
 #include <stdarg.h>
 #include <stdio.h>
-#include "main/core.h" /* for struct gl_shader */
+#include "main/mtypes.h"
 #include "main/shaderobj.h"
 #include "ir_builder.h"
 #include "glsl_parser_extras.h"

src/compiler/glsl/builtin_functions.h

@@ -24,6 +24,8 @@
 #ifndef BULITIN_FUNCTIONS_H
 #define BULITIN_FUNCTIONS_H
 
+struct gl_shader;
+
 extern void
 _mesa_glsl_initialize_builtin_functions();
 

src/compiler/glsl/builtin_variables.cpp

@@ -26,7 +26,7 @@
 #include "linker.h"
 #include "glsl_parser_extras.h"
 #include "glsl_symbol_table.h"
-#include "main/core.h"
+#include "main/mtypes.h"
 #include "main/uniforms.h"
 #include "program/prog_statevars.h"
 #include "program/prog_instruction.h"

src/compiler/glsl/glcpp/glcpp-parse.y

@@ -29,8 +29,7 @@
 #include <inttypes.h>
 
 #include "glcpp.h"
-#include "main/core.h" /* for struct gl_extensions */
-#include "main/mtypes.h" /* for gl_api enum */
+#include "main/mtypes.h"
 
 static void
 yyerror(YYLTYPE *locp, glcpp_parser_t *parser, const char *error);

src/compiler/glsl/glcpp/glcpp.c

@@ -27,7 +27,6 @@
 #include <getopt.h>
 
 #include "glcpp.h"
-#include "main/mtypes.h"
 #include "main/shaderobj.h"
 #include "util/strtod.h"
 

src/compiler/glsl/glcpp/glcpp.h

@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "main/mtypes.h"
+#include "main/menums.h"
 
 #include "util/ralloc.h"
 
@@ -35,6 +35,8 @@
 
 #include "util/string_buffer.h"
 
+struct gl_context;
+
 #define yyscan_t void*
 
 /* Some data types used for parser values. */

src/compiler/glsl/glcpp/pp.c

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "glcpp.h"
+#include "main/mtypes.h"
 
 void
 glcpp_error (YYLTYPE *locp, glcpp_parser_t *parser, const char *fmt, ...)

src/compiler/glsl/glsl_parser_extras.cpp

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include "main/core.h" /* for struct gl_context */
 #include "main/context.h"
 #include "main/debug_output.h"
 #include "main/formats.h"

src/compiler/glsl/glsl_to_nir.cpp

@@ -32,6 +32,7 @@
 #include "compiler/nir/nir_control_flow.h"
 #include "compiler/nir/nir_builder.h"
 #include "main/imports.h"
+#include "main/mtypes.h"
 
 /*
  * pass to lower GLSL IR to NIR

src/compiler/glsl/ir.cpp

@@ -21,7 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <string.h>
-#include "main/core.h" /* for MAX2 */
 #include "ir.h"
 #include "compiler/glsl_types.h"
 #include "glsl_parser_extras.h"

src/compiler/glsl/ir.h

@@ -33,7 +33,6 @@
 #include "list.h"
 #include "ir_visitor.h"
 #include "ir_hierarchical_visitor.h"
-#include "main/mtypes.h"
 
 #ifdef __cplusplus
 

src/compiler/glsl/ir_constant_expression.cpp

@@ -34,12 +34,12 @@
  */
 
 #include <math.h>
-#include "main/core.h" /* for MAX2, MIN2, CLAMP */
 #include "util/rounding.h" /* for _mesa_roundeven */
 #include "util/half_float.h"
 #include "ir.h"
 #include "compiler/glsl_types.h"
 #include "util/hash_table.h"
+#include "main/imports.h"
 
 static float
 dot_f(ir_constant *op0, ir_constant *op1)

src/compiler/glsl/ir_function_detect_recursion.cpp

@@ -120,7 +120,6 @@
  *
  * \author Ian Romanick <ian.d.romanick@intel.com>
  */
-#include "main/core.h"
 #include "ir.h"
 #include "glsl_parser_extras.h"
 #include "linker.h"

src/compiler/glsl/ir_optimization.h

@@ -30,6 +30,9 @@
 #ifndef GLSL_IR_OPTIMIZATION_H
 #define GLSL_IR_OPTIMIZATION_H
 
+struct gl_linked_shader;
+struct gl_shader_program;
+
 /* Operations for lower_instructions() */
 #define SUB_TO_ADD_NEG     0x01
 #define FDIV_TO_MUL_RCP    0x02

src/compiler/glsl/ir_set_program_inouts.cpp

@@ -34,10 +34,10 @@
  * from the GLSL IR.
  */
 
-#include "main/core.h" /* for struct gl_program */
 #include "ir.h"
 #include "ir_visitor.h"
 #include "compiler/glsl_types.h"
+#include "main/mtypes.h"
 
 namespace {
 

src/compiler/glsl/ir_uniform.h

@@ -28,7 +28,7 @@
 /* stdbool.h is necessary because this file is included in both C and C++ code.
  */
 #include <stdbool.h>
-
+#include "util/macros.h"
 #include "program/prog_parameter.h"  /* For union gl_constant_value. */
 
 /**

src/compiler/glsl/link_atomics.cpp

@@ -25,7 +25,9 @@
 #include "ir.h"
 #include "ir_uniform.h"
 #include "linker.h"
+#include "main/errors.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 
 namespace {
    /*

src/compiler/glsl/link_functions.cpp

@@ -21,7 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/core.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ir.h"
@@ -29,6 +28,7 @@
 #include "util/set.h"
 #include "util/hash_table.h"
 #include "linker.h"
+#include "main/mtypes.h"
 
 static ir_function_signature *
 find_matching_signature(const char *name, const exec_list *actual_parameters,

src/compiler/glsl/link_interface_blocks.cpp

@@ -30,6 +30,7 @@
 #include "glsl_symbol_table.h"
 #include "linker.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 #include "util/hash_table.h"
 
 

src/compiler/glsl/link_uniform_blocks.cpp

@@ -21,13 +21,14 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/core.h"
 #include "ir.h"
 #include "linker.h"
 #include "ir_uniform.h"
 #include "link_uniform_block_active_visitor.h"
 #include "util/hash_table.h"
 #include "program.h"
+#include "main/errors.h"
+#include "main/mtypes.h"
 
 namespace {
 

src/compiler/glsl/link_uniform_initializers.cpp

@@ -21,11 +21,11 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/core.h"
 #include "ir.h"
 #include "linker.h"
 #include "ir_uniform.h"
 #include "string_to_uint_map.h"
+#include "main/mtypes.h"
 
 /* These functions are put in a "private" namespace instead of being marked
  * static so that the unit tests can access them.  See

src/compiler/glsl/link_uniforms.cpp

@@ -21,7 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/core.h"
 #include "ir.h"
 #include "linker.h"
 #include "ir_uniform.h"
@@ -29,6 +28,7 @@
 #include "program.h"
 #include "string_to_uint_map.h"
 #include "ir_array_refcount.h"
+#include "main/mtypes.h"
 
 /**
  * \file link_uniforms.cpp

src/compiler/glsl/link_varyings.cpp

@@ -29,6 +29,7 @@
  */
 
 
+#include "main/errors.h"
 #include "main/mtypes.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"

src/compiler/glsl/linker.cpp

@@ -66,7 +66,6 @@
 
 #include <ctype.h>
 #include "util/strndup.h"
-#include "main/core.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ir.h"
@@ -84,8 +83,10 @@
 #include "builtin_functions.h"
 #include "shader_cache.h"
 
+#include "main/imports.h"
 #include "main/shaderobj.h"
 #include "main/enums.h"
+#include "main/mtypes.h"
 
 
 namespace {

src/compiler/glsl/linker.h

@@ -25,6 +25,10 @@
 #ifndef GLSL_LINKER_H
 #define GLSL_LINKER_H
 
+struct gl_shader_program;
+struct gl_shader;
+struct gl_linked_shader;
+
 extern bool
 link_function_calls(gl_shader_program *prog, gl_linked_shader *main,
                     gl_shader **shader_list, unsigned num_shaders);

src/compiler/glsl/lower_blend_equation_advanced.cpp

@@ -29,6 +29,7 @@
 #include "program/prog_statevars.h"
 #include "util/bitscan.h"
 #include "builtin_functions.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_cs_derived.cpp

@@ -43,6 +43,7 @@
 #include "linker.h"
 #include "program/prog_statevars.h"
 #include "builtin_functions.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_distance.cpp

@@ -50,6 +50,7 @@
 #include "ir_rvalue_visitor.h"
 #include "ir.h"
 #include "program/prog_instruction.h" /* For WRITEMASK_* */
+#include "main/mtypes.h"
 
 #define GLSL_CLIP_VAR_NAME "gl_ClipDistanceMESA"
 

src/compiler/glsl/lower_named_interface_blocks.cpp

@@ -64,6 +64,7 @@
 #include "ir_optimization.h"
 #include "ir_rvalue_visitor.h"
 #include "util/hash_table.h"
+#include "main/mtypes.h"
 
 static const glsl_type *
 process_array_type(const glsl_type *type, unsigned idx)

src/compiler/glsl/lower_packed_varyings.cpp

@@ -149,6 +149,7 @@
 #include "ir_builder.h"
 #include "ir_optimization.h"
 #include "program/prog_instruction.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_shared_reference.cpp

@@ -37,6 +37,7 @@
 #include "main/macros.h"
 #include "util/list.h"
 #include "glsl_parser_extras.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_tess_level.cpp

@@ -49,6 +49,7 @@
 #include "ir_rvalue_visitor.h"
 #include "ir.h"
 #include "program/prog_instruction.h" /* For WRITEMASK_* */
+#include "main/mtypes.h"
 
 namespace {
 

src/compiler/glsl/lower_ubo_reference.cpp

@@ -37,6 +37,7 @@
 #include "ir_builder.h"
 #include "main/macros.h"
 #include "glsl_parser_extras.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_vector_derefs.cpp

@@ -24,6 +24,7 @@
 #include "ir_builder.h"
 #include "ir_rvalue_visitor.h"
 #include "ir_optimization.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_vertex_id.cpp

@@ -38,6 +38,7 @@
 #include "linker.h"
 #include "program/prog_statevars.h"
 #include "builtin_functions.h"
+#include "main/mtypes.h"
 
 namespace {
 

src/compiler/glsl/main.cpp

@@ -21,6 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
 
@@ -33,7 +34,6 @@
  * offline compile GLSL code and examine the resulting GLSL IR.
  */
 
-#include "main/mtypes.h"
 #include "standalone.h"
 
 static struct standalone_options options;

src/compiler/glsl/opt_algebraic.cpp

@@ -34,6 +34,7 @@
 #include "ir_optimization.h"
 #include "ir_builder.h"
 #include "compiler/glsl_types.h"
+#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/opt_dead_builtin_varyings.cpp

@@ -46,13 +46,13 @@
  * The same is done for the gl_FragData fragment shader output.
  */
 
-#include "main/core.h" /* for snprintf and ARRAY_SIZE */
 #include "ir.h"
 #include "ir_rvalue_visitor.h"
 #include "ir_optimization.h"
 #include "ir_print_visitor.h"
 #include "compiler/glsl_types.h"
 #include "link_varyings.h"
+#include "main/mtypes.h"
 
 namespace {
 

src/compiler/glsl/s_expression.cpp

@@ -25,6 +25,8 @@
 #include <assert.h>
 #include <stdio.h>
 #include <math.h>
+#include <string.h>
+#include <stdlib.h>
 #include "s_expression.h"
 
 s_symbol::s_symbol(const char *str, size_t n)

src/compiler/glsl/s_expression.h

@@ -25,7 +25,6 @@
 #ifndef S_EXPRESSION_H
 #define S_EXPRESSION_H
 
-#include "main/core.h" /* for Elements */
 #include "util/strtod.h"
 #include "list.h"
 

src/compiler/glsl/shader_cache.cpp

@@ -53,13 +53,13 @@
 #include "ir_uniform.h"
 #include "linker.h"
 #include "link_varyings.h"
-#include "main/core.h"
 #include "nir.h"
 #include "program.h"
 #include "serialize.h"
 #include "shader_cache.h"
 #include "util/mesa-sha1.h"
 #include "string_to_uint_map.h"
+#include "main/mtypes.h"
 
 extern "C" {
 #include "main/enums.h"

src/compiler/glsl/shader_cache.h

@@ -26,6 +26,9 @@
 
 #include "util/disk_cache.h"
 
+struct gl_context;
+struct gl_shader_program;
+
 void
 shader_cache_write_program_metadata(struct gl_context *ctx,
                                     struct gl_shader_program *prog);

src/compiler/glsl/standalone.cpp

@@ -43,6 +43,7 @@
 #include "ir_builder_print_visitor.h"
 #include "builtin_functions.h"
 #include "opt_add_neg_to_sub.h"
+#include "main/mtypes.h"
 
 class dead_variable_visitor : public ir_hierarchical_visitor {
 public:

src/compiler/glsl/standalone_scaffolding.cpp

@@ -34,6 +34,7 @@
 #include <string.h>
 #include "util/ralloc.h"
 #include "util/strtod.h"
+#include "main/mtypes.h"
 
 void
 _mesa_warning(struct gl_context *ctx, const char *fmt, ...)

src/compiler/glsl/standalone_scaffolding.h

@@ -31,7 +31,7 @@
 #define STANDALONE_SCAFFOLDING_H
 
 #include <assert.h>
-#include "main/mtypes.h"
+#include "main/menums.h"
 #include "program/prog_statevars.h"
 
 extern "C" void

src/compiler/glsl_types.h

@@ -30,6 +30,11 @@
 
 #include "shader_enums.h"
 #include "blob.h"
+#include "c11/threads.h"
+
+#ifdef __cplusplus
+#include "main/config.h"
+#endif
 
 struct glsl_type;
 
@@ -146,7 +151,7 @@ enum {
 #ifdef __cplusplus
 #include "GL/gl.h"
 #include "util/ralloc.h"
-#include "main/mtypes.h" /* for gl_texture_index, C++'s enum rules are broken */
+#include "main/menums.h" /* for gl_texture_index, C++'s enum rules are broken */
 
 struct glsl_type {
    GLenum gl_type;

src/compiler/nir/nir_constant_expressions.py

@@ -76,7 +76,6 @@ template = """\
  */
 
 #include <math.h>
-#include "main/core.h"
 #include "util/rounding.h" /* for _mesa_roundeven */
 #include "util/half_float.h"
 #include "nir_constant_expressions.h"

src/compiler/nir/nir_gather_info.c

@@ -21,8 +21,8 @@
  * IN THE SOFTWARE.
  */
 
-#include "main/mtypes.h"
 #include "nir.h"
+#include "main/menums.h"
 
 static void
 set_io_mask(nir_shader *shader, nir_variable *var, int offset, int len,

src/compiler/nir/nir_lower_atomics.c

@@ -28,6 +28,7 @@
 #include "compiler/glsl/ir_uniform.h"
 #include "nir.h"
 #include "main/config.h"
+#include "main/mtypes.h"
 #include <assert.h>
 
 /*

src/compiler/nir/nir_lower_samplers.c

@@ -29,8 +29,6 @@
 
 #include "main/compiler.h"
 #include "main/mtypes.h"
-#include "program/prog_parameter.h"
-#include "program/program.h"
 
 /* Calculate the sampler index based on array indicies and also
  * calculate the base uniform location for struct members.

src/compiler/nir/nir_lower_samplers_as_deref.c

@@ -61,8 +61,6 @@
 
 #include "main/compiler.h"
 #include "main/mtypes.h"
-#include "program/prog_parameter.h"
-#include "program/program.h"
 
 struct lower_samplers_as_deref_state {
    nir_shader *shader;

src/gallium/state_trackers/glx/xlib/glx_usefont.c

@@ -31,7 +31,6 @@
 
 
 #include <stdio.h>
-#include "main/core.h"
 #include <GL/glx.h>
 
 

src/gallium/state_trackers/glx/xlib/xm_api.h

@@ -57,7 +57,7 @@ and create a window, you must do the following to use the X/Mesa interface:
 #define XMESA_H
 
 
-#include "main/core.h" /* for gl_config */
+#include "main/mtypes.h" /* for gl_config */
 #include "state_tracker/st_api.h"
 #include "os/os_thread.h"
 

src/intel/common/gen_urb_config.c

@@ -26,6 +26,7 @@
 
 #include "util/macros.h"
 #include "main/macros.h"
+#include "compiler/shader_enums.h"
 
 #include "gen_l3_config.h"
 

src/intel/compiler/brw_compiler.h

@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include "dev/gen_device_info.h"
 #include "main/macros.h"
+#include "main/mtypes.h"
 #include "util/ralloc.h"
 
 #ifdef __cplusplus

src/intel/compiler/brw_eu.h

@@ -34,6 +34,7 @@
 #define BRW_EU_H
 
 #include <stdbool.h>
+#include <stdio.h>
 #include "brw_inst.h"
 #include "brw_eu_defines.h"
 #include "brw_reg.h"

src/mesa/Makefile.sources

@@ -55,7 +55,6 @@ MAIN_FILES = \
 	main/convolve.h \
 	main/copyimage.c \
 	main/copyimage.h \
-	main/core.h \
 	main/cpuinfo.c \
 	main/cpuinfo.h \
 	main/dd.h \
@@ -148,6 +147,7 @@ MAIN_FILES = \
 	main/mipmap.h \
 	main/mm.c \
 	main/mm.h \
+	main/menums.h \
 	main/mtypes.h \
 	main/multisample.c \
 	main/multisample.h \

src/mesa/drivers/dri/common/dri_util.h

@@ -55,10 +55,14 @@
 
 #include <GL/gl.h>
 #include <GL/internal/dri_interface.h>
-#include "main/mtypes.h"
+#include "main/menums.h"
+#include "main/formats.h"
 #include "util/xmlconfig.h"
 #include <stdbool.h>
 
+struct gl_config;
+struct gl_context;
+
 /**
  * Extensions.
  */

src/mesa/drivers/dri/i915/intel_context.h

@@ -32,6 +32,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include "main/mtypes.h"
+#include "main/errors.h"
 
 #include <drm.h>
 #include <intel_bufmgr.h>

src/mesa/drivers/dri/i965/brw_context.h

@@ -36,6 +36,7 @@
 #include <stdbool.h>
 #include "main/macros.h"
 #include "main/mtypes.h"
+#include "main/errors.h"
 #include "vbo/vbo.h"
 #include "brw_structs.h"
 #include "brw_pipe_control.h"

src/mesa/drivers/dri/r200/r200_state_init.c

@@ -31,6 +31,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Keith Whitwell <keithw@vmware.com>
  */
 
+#include "main/errors.h"
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/enums.h"

src/mesa/drivers/dri/r200/r200_vertprog.c

@@ -30,6 +30,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
  *   Aapo Tahkola <aet@rasterburn.org>
  *   Roland Scheidegger <rscheidegger_lists@hispeed.ch>
  */
+
+#include "main/errors.h"
 #include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"

src/mesa/drivers/dri/radeon/radeon_state.c

@@ -41,7 +41,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/fbobject.h"
 #include "util/simple_list.h"
 #include "main/state.h"
-#include "main/core.h"
 #include "main/stencil.h"
 #include "main/viewport.h"
 

src/mesa/drivers/dri/radeon/radeon_state_init.c

@@ -27,6 +27,7 @@
  *    Keith Whitwell <keithw@vmware.com>
  */
 
+#include "main/errors.h"
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/api_arrayelt.h"

src/mesa/main/api_arrayelt.h

@@ -27,9 +27,10 @@
 #ifndef API_ARRAYELT_H
 #define API_ARRAYELT_H
 
+#include <stdbool.h>
+#include "dd.h"
 
-#include "main/mtypes.h"
-
+struct _glapi_table;
 
 extern GLboolean _ae_create_context( struct gl_context *ctx );
 extern void _ae_destroy_context( struct gl_context *ctx );

src/mesa/main/buffers.h

@@ -34,7 +34,7 @@
 
 
 #include "glheader.h"
-#include "mtypes.h"
+#include "menums.h"
 
 struct gl_context;
 struct gl_framebuffer;

src/mesa/main/colormac.h

@@ -35,7 +35,6 @@
 
 #include "config.h"
 #include "macros.h"
-#include "mtypes.h"
 
 
 /**

src/mesa/main/context.h

@@ -49,6 +49,7 @@
 #define CONTEXT_H
 
 
+#include "errors.h"
 #include "imports.h"
 #include "extensions.h"
 #include "mtypes.h"

src/mesa/main/copyimage.h

@@ -29,7 +29,7 @@
 #ifndef COPYIMAGE_H
 #define COPYIMAGE_H
 
-#include "mtypes.h"
+#include "glheader.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mesa/main/core.h

@@ -1,53 +0,0 @@
-/*
- * Mesa 3-D graphics library
- *
- * Copyright (C) 2010 LunarG Inc.
- *
- * 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- *
- * Authors:
- *    Chia-I Wu <olv@lunarg.com>
- */
-
-
-/**
- * \file core.h
- * The public header of core mesa.
- *
- * This file is the (only) public header of core mesa.  It is supposed to be
- * used by GLX, WGL, and GLSL.
- */
-
-
-#ifndef CORE_H
-#define CORE_H
-
-
-#include "main/glheader.h"
-#include "main/compiler.h"
-#include "main/imports.h"
-#include "main/macros.h"
-
-#include "main/mtypes.h"
-
-/* for GLSL */
-#include "program/prog_parameter.h"
-
-
-#endif /* CORE_H */

src/mesa/main/dd.h

@@ -31,9 +31,9 @@
 #ifndef DD_INCLUDED
 #define DD_INCLUDED
 
-/* THIS FILE ONLY INCLUDED BY mtypes.h !!!!! */
-
 #include "glheader.h"
+#include "formats.h"
+#include "menums.h"
 
 struct gl_bitmap_atlas;
 struct gl_buffer_object;
@@ -50,6 +50,8 @@ struct gl_shader_program;
 struct gl_texture_image;
 struct gl_texture_object;
 struct gl_memory_info;
+struct gl_transform_feedback_object;
+struct ati_fragment_shader;
 struct util_queue_monitoring;
 struct _mesa_prim;
 struct _mesa_index_buffer;

src/mesa/main/debug.c

@@ -24,6 +24,7 @@
  */
 
 #include <stdio.h>
+#include "errors.h"
 #include "mtypes.h"
 #include "attrib.h"
 #include "enums.h"

src/mesa/main/debug_output.h

@@ -30,13 +30,14 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "glheader.h"
-#include "mtypes.h"
+#include "menums.h"
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct gl_context;
 
 void
 _mesa_init_debug_output(struct gl_context *ctx);

src/mesa/main/dlist.h

@@ -33,8 +33,8 @@
 #define DLIST_H
 
 #include <stdio.h>
-#include "main/mtypes.h"
 
+struct gl_context;
 
 /**
  * Describes the location and size of a glBitmap image in a texture atlas.

src/mesa/main/drawtex.c

@@ -21,6 +21,7 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#include "main/errors.h"
 #include "main/drawtex.h"
 #include "main/state.h"
 #include "main/imports.h"

src/mesa/main/errors.h

@@ -39,13 +39,15 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include "glheader.h"
-#include "mtypes.h"
+#include "menums.h"
 
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct gl_context;
+
 extern void
 _mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
 

src/mesa/main/eval.h

@@ -37,7 +37,7 @@
 #define EVAL_H
 
 
-#include "main/mtypes.h"
+#include "dd.h"
 #include <stdbool.h>
 
 

src/mesa/main/execmem.c

@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include "imports.h"
 #include "execmem.h"
-
+#include "c11/threads.h"
 
 
 #if defined(__linux__) || defined(__OpenBSD__) || defined(_NetBSD__) || defined(__sun) || defined(__HAIKU__)

src/mesa/main/extensions.h

@@ -36,7 +36,7 @@
 #ifndef _EXTENSIONS_H_
 #define _EXTENSIONS_H_
 
-#include "glheader.h"
+#include "mtypes.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mesa/main/extensions_table.c

@@ -23,7 +23,6 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include "main/mtypes.h"
 #include "main/extensions.h"
 
 /**

src/mesa/main/ffvertex_prog.c

@@ -33,6 +33,7 @@
  */
 
 
+#include "main/errors.h"
 #include "main/glheader.h"
 #include "main/mtypes.h"
 #include "main/macros.h"

src/mesa/main/format_pack.py

@@ -42,6 +42,8 @@ string = """/*
 
 #include <stdint.h>
 
+#include "config.h"
+#include "errors.h"
 #include "format_pack.h"
 #include "format_utils.h"
 #include "macros.h"

src/mesa/main/format_unpack.py

@@ -42,6 +42,7 @@ string = """/*
 
 #include <stdint.h>
 
+#include "errors.h"
 #include "format_unpack.h"
 #include "format_utils.h"
 #include "macros.h"

src/mesa/main/format_utils.c

@@ -22,6 +22,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "errors.h"
 #include "format_utils.h"
 #include "glformats.h"
 #include "format_pack.h"

src/mesa/main/format_utils.h

@@ -31,6 +31,7 @@
 #ifndef FORMAT_UTILS_H
 #define FORMAT_UTILS_H
 
+#include "formats.h"
 #include "imports.h"
 #include "macros.h"
 #include "util/rounding.h"

src/mesa/main/formats.c

@@ -24,6 +24,7 @@
  */
 
 
+#include "errors.h"
 #include "imports.h"
 #include "formats.h"
 #include "macros.h"

src/mesa/main/glformats.h

@@ -36,6 +36,8 @@
 extern "C" {
 #endif
 
+struct gl_context;
+
 extern void
 _mesa_compute_component_mapping(GLenum inFormat, GLenum outFormat, GLubyte *map);
 

src/mesa/main/glheader.h

@@ -42,10 +42,12 @@
 extern "C" {
 #endif
 
+
 /* Custom Mesa types to save space. */
 typedef unsigned short GLenum16;
 typedef unsigned char GLbitfield8;
 typedef unsigned short GLbitfield16;
+typedef GLuint64 GLbitfield64;
 
 typedef int GLclampx;
 

src/mesa/main/glspirv.c

@@ -24,6 +24,7 @@
 #include "glspirv.h"
 #include "errors.h"
 #include "shaderobj.h"
+#include "mtypes.h"
 
 #include "compiler/nir/nir.h"
 #include "compiler/spirv/nir_spirv.h"

src/mesa/main/glspirv.h

@@ -25,12 +25,14 @@
 #define GLSPIRV_H
 
 #include "compiler/nir/nir.h"
-#include "mtypes.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct gl_context;
+struct gl_shader;
+
 /**
  * A SPIR-V module contains the raw SPIR-V binary as set by ShaderBinary.
  *

src/mesa/main/glthread.h

@@ -24,8 +24,6 @@
 #ifndef _GLTHREAD_H
 #define _GLTHREAD_H
 
-#include "main/mtypes.h"
-
 /* The size of one batch and the maximum size of one call.
  *
  * This should be as low as possible, so that:
@@ -50,6 +48,7 @@
 #include "util/u_queue.h"
 
 enum marshal_dispatch_cmd_id;
+struct gl_context;
 
 /** A single batch of commands queued up for execution. */
 struct glthread_batch

src/mesa/main/hash.c

@@ -34,6 +34,7 @@
  * OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "errors.h"
 #include "glheader.h"
 #include "hash.h"
 #include "util/hash_table.h"

src/mesa/main/hash.h

@@ -34,6 +34,7 @@
 
 #include "glheader.h"
 #include "imports.h"
+#include "c11/threads.h"
 
 /**
  * Magic GLuint object name that gets stored outside of the struct hash_table.