treewide: drop mtypes/macros includes from main

These aren't required in lots of places, so remove them.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14127>

diff --git a/src/amd/common/ac_rgp_elf_object_pack.c b/src/amd/common/ac_rgp_elf_object_pack.c
index 4f1961b..7873863 100644 (file)
--- a/src/amd/common/ac_rgp_elf_object_pack.c
+++ b/src/amd/common/ac_rgp_elf_object_pack.c
@@ -37,7 +37,9 @@
 #include <libelf.h>
 #include "ac_msgpack.h"
 #include "ac_rgp.h"
-#include "main/macros.h"
+
+#include "util/bitscan.h"
+#include "util/u_math.h"
 
 #ifndef EM_AMDGPU
 // Old distributions may not have this enum constant

diff --git a/src/asahi/compiler/agx_compile.c b/src/asahi/compiler/agx_compile.c
index 1066ed4..da71f79 100644 (file)
--- a/src/asahi/compiler/agx_compile.c
+++ b/src/asahi/compiler/agx_compile.c
@@ -23,7 +23,7 @@
  * SOFTWARE.
  */
 
-#include "main/mtypes.h"
+#include "main/glheader.h"
 #include "compiler/nir_types.h"
 #include "compiler/nir/nir_builder.h"
 #include "util/u_debug.h"

diff --git a/src/compiler/glsl/glsl_to_nir.h b/src/compiler/glsl/glsl_to_nir.h
index 38728d3..2d3daf3 100644 (file)
--- a/src/compiler/glsl/glsl_to_nir.h
+++ b/src/compiler/glsl/glsl_to_nir.h
@@ -34,6 +34,7 @@
 extern "C" {
 #endif
 
+struct gl_context;
 struct gl_shader_program;
 
 nir_shader *glsl_to_nir(struct gl_context *ctx,

diff --git a/src/gallium/drivers/crocus/crocus_batch.c b/src/gallium/drivers/crocus/crocus_batch.c
index 6f0026d..318edd0 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_batch.c
+++ b/src/gallium/drivers/crocus/crocus_batch.c
@@ -45,7 +45,6 @@
 #include "drm-uapi/i915_drm.h"
 
 #include "intel/common/intel_gem.h"
-#include "main/macros.h"
 #include "util/hash_table.h"
 #include "util/set.h"
 #include "util/u_upload_mgr.h"

diff --git a/src/gallium/drivers/crocus/crocus_bufmgr.c b/src/gallium/drivers/crocus/crocus_bufmgr.c
index 9afdb30..ff0ef11 100644 (file)
--- a/src/gallium/drivers/crocus/crocus_bufmgr.c
+++ b/src/gallium/drivers/crocus/crocus_bufmgr.c
@@ -55,7 +55,6 @@
 #include "dev/intel_debug.h"
 #include "common/intel_gem.h"
 #include "dev/intel_device_info.h"
-#include "main/macros.h"
 #include "util/debug.h"
 #include "util/macros.h"
 #include "util/hash_table.h"

diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c
index 6a99912..cc45277 100644 (file)
--- a/src/gallium/drivers/iris/iris_batch.c
+++ b/src/gallium/drivers/iris/iris_batch.c
@@ -49,7 +49,6 @@
 #include "util/hash_table.h"
 #include "util/set.h"
 #include "util/u_upload_mgr.h"
-#include "main/macros.h"
 
 #include <errno.h>
 #include <xf86drm.h>

diff --git a/src/gallium/drivers/iris/iris_bufmgr.c b/src/gallium/drivers/iris/iris_bufmgr.c
index d70bb18..14401b0 100644 (file)
--- a/src/gallium/drivers/iris/iris_bufmgr.c
+++ b/src/gallium/drivers/iris/iris_bufmgr.c
@@ -54,7 +54,6 @@
 #include "common/intel_gem.h"
 #include "dev/intel_device_info.h"
 #include "isl/isl.h"
-#include "main/macros.h"
 #include "os/os_mman.h"
 #include "util/debug.h"
 #include "util/macros.h"

diff --git a/src/gallium/frontends/dri/dri_util.c b/src/gallium/frontends/dri/dri_util.c
index f379cef..1ae333b 100644 (file)
--- a/src/gallium/frontends/dri/dri_util.c
+++ b/src/gallium/frontends/dri/dri_util.c
@@ -44,12 +44,10 @@
 #include "utils.h"
 #include "util/u_endian.h"
 #include "util/driconf.h"
-#include "main/mtypes.h"
 #include "main/framebuffer.h"
 #include "main/version.h"
 #include "main/debug_output.h"
 #include "main/errors.h"
-#include "main/macros.h"
 
 driOptionDescription __dri2ConfigOptions[] = {
       DRI_CONF_SECTION_DEBUG

diff --git a/src/gallium/frontends/dri/utils.c b/src/gallium/frontends/dri/utils.c
index a3f2bc5..241bade 100644 (file)
--- a/src/gallium/frontends/dri/utils.c
+++ b/src/gallium/frontends/dri/utils.c
@@ -34,8 +34,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include "main/macros.h"
-#include "main/mtypes.h"
 #include "main/cpuinfo.h"
 #include "main/extensions.h"
 #include "utils.h"

diff --git a/src/gallium/targets/dri/megadriver_stub.c b/src/gallium/targets/dri/megadriver_stub.c
index d085080..484c835 100644 (file)
--- a/src/gallium/targets/dri/megadriver_stub.c
+++ b/src/gallium/targets/dri/megadriver_stub.c
@@ -24,7 +24,6 @@
 #include <stdio.h>
 #include "dri_util.h"
 #include <dlfcn.h>
-#include "main/macros.h"
 
 /* We need GNU extensions to dlfcn.h in order to provide backward
  * compatibility for the older DRI driver loader mechanism. (dladdr,

diff --git a/src/intel/blorp/blorp_clear.c b/src/intel/blorp/blorp_clear.c
index 4c2f108..cbd409b 100644 (file)
--- a/src/intel/blorp/blorp_clear.c
+++ b/src/intel/blorp/blorp_clear.c
@@ -23,7 +23,7 @@
 
 #include "util/ralloc.h"
 
-#include "main/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
+#include "util/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
 #include "util/format_rgb9e5.h"
 #include "util/format_srgb.h"
 

diff --git a/src/intel/common/intel_aux_map.c b/src/intel/common/intel_aux_map.c
index 20d2548..153ab59 100644 (file)
--- a/src/intel/common/intel_aux_map.c
+++ b/src/intel/common/intel_aux_map.c
@@ -84,7 +84,7 @@
 #include "util/list.h"
 #include "util/ralloc.h"
 #include "util/u_atomic.h"
-#include "main/macros.h"
+#include "util/u_math.h"
 
 #include <inttypes.h>
 #include <stdlib.h>

diff --git a/src/intel/common/intel_batch_decoder.c b/src/intel/common/intel_batch_decoder.c
index 8821bf1..d927598 100644 (file)
--- a/src/intel/common/intel_batch_decoder.c
+++ b/src/intel/common/intel_batch_decoder.c
@@ -24,7 +24,7 @@
 #include "common/intel_decoder.h"
 #include "intel_disasm.h"
 #include "util/macros.h"
-#include "main/macros.h" /* Needed for ROUND_DOWN_TO */
+#include "util/u_math.h" /* Needed for ROUND_DOWN_TO */
 
 #include <string.h>
 

diff --git a/src/intel/common/intel_l3_config.c b/src/intel/common/intel_l3_config.c
index a48e33b..c7c6b30 100644 (file)
--- a/src/intel/common/intel_l3_config.c
+++ b/src/intel/common/intel_l3_config.c
@@ -25,7 +25,6 @@
 #include <math.h>
 
 #include "util/macros.h"
-#include "main/macros.h"
 
 #include "intel_l3_config.h"
 

diff --git a/src/intel/common/intel_urb_config.c b/src/intel/common/intel_urb_config.c
index f7fabde..15fe80c 100644 (file)
--- a/src/intel/common/intel_urb_config.c
+++ b/src/intel/common/intel_urb_config.c
@@ -25,7 +25,7 @@
 #include <math.h>
 
 #include "util/macros.h"
-#include "main/macros.h"
+#include "util/u_math.h"
 #include "compiler/shader_enums.h"
 
 #include "intel_l3_config.h"

diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index e69e0d6..9dd5e4c 100644 (file)
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -27,7 +27,7 @@
 #include "isl_priv.h"
 #include "dev/intel_device_info.h"
 
-#include "main/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
+#include "util/macros.h" /* Needed for MAX3 and MAX2 for format_rgb9e5 */
 #include "util/format_srgb.h"
 #include "util/format_rgb9e5.h"
 #include "util/format_r11g11b10f.h"

diff --git a/src/intel/isl/isl_tiled_memcpy.c b/src/intel/isl/isl_tiled_memcpy.c
index b3ec54a..fed0851 100644 (file)
--- a/src/intel/isl/isl_tiled_memcpy.c
+++ b/src/intel/isl/isl_tiled_memcpy.c
@@ -32,8 +32,8 @@
 #include <string.h>
 
 #include "util/macros.h"
-#include "main/macros.h"
-
+#include "util/u_math.h"
+#include "util/rounding.h"
 #include "isl_priv.h"
 
 #if defined(__SSSE3__)

diff --git a/src/panfrost/bifrost/bifrost_compile.c b/src/panfrost/bifrost/bifrost_compile.c
index 29534a9..9333550 100644 (file)
--- a/src/panfrost/bifrost/bifrost_compile.c
+++ b/src/panfrost/bifrost/bifrost_compile.c
@@ -24,7 +24,6 @@
  *      Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
  */
 
-#include "main/mtypes.h"
 #include "compiler/glsl/glsl_to_nir.h"
 #include "compiler/nir_types.h"
 #include "compiler/nir/nir_builder.h"

diff --git a/src/panfrost/midgard/compiler.h b/src/panfrost/midgard/compiler.h
index 474a99c..5847889 100644 (file)
--- a/src/panfrost/midgard/compiler.h
+++ b/src/panfrost/midgard/compiler.h
@@ -34,8 +34,8 @@
 #include "util/u_dynarray.h"
 #include "util/set.h"
 #include "util/list.h"
+#include "util/u_math.h"
 
-#include "main/mtypes.h"
 #include "compiler/nir_types.h"
 #include "compiler/nir/nir.h"
 #include "panfrost/util/pan_ir.h"

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 69e60f0..c7b94f1 100644 (file)
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #include <err.h>
 
-#include "main/mtypes.h"
 #include "compiler/glsl/glsl_to_nir.h"
 #include "compiler/nir_types.h"
 #include "compiler/nir/nir_builder.h"
@@ -40,7 +39,6 @@
 #include "util/u_debug.h"
 #include "util/u_dynarray.h"
 #include "util/list.h"
-#include "main/mtypes.h"
 
 #include "midgard.h"
 #include "midgard_nir.h"

diff --git a/src/util/register_allocate.c b/src/util/register_allocate.c
index d9686d2..02e1b1b 100644 (file)
--- a/src/util/register_allocate.c
+++ b/src/util/register_allocate.c
@@ -75,7 +75,6 @@
 
 #include "blob.h"
 #include "ralloc.h"
-#include "main/macros.h"
 #include "util/bitset.h"
 #include "util/u_dynarray.h"
 #include "u_math.h"