glsl: move off mtypes.h in lots of places.

This moves to the new split out header files, should mean less recompiling
for unrelated changes.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14437>

src/compiler/glsl/gl_nir_link_uniform_blocks.c

@@ -25,7 +25,7 @@
 #include "gl_nir_linker.h"
 #include "ir_uniform.h" /* for gl_uniform_storage */
 #include "linker_util.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 /**
  * This file contains code to do a nir-based linking for uniform blocks. This

src/compiler/glsl/gl_nir_link_uniform_initializers.c

@@ -25,7 +25,7 @@
 #include "gl_nir_linker.h"
 #include "compiler/glsl/ir_uniform.h" /* for gl_uniform_storage */
 #include "main/context.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 struct set_opaque_binding_closure {
    struct gl_shader_program *shader_prog;

src/compiler/glsl/gl_nir_link_uniforms.c

@@ -27,8 +27,9 @@
 #include "gl_nir_linker.h"
 #include "compiler/glsl/ir_uniform.h" /* for gl_uniform_storage */
 #include "linker_util.h"
-#include "main/context.h"
+#include "util/u_dynarray.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 
 /**
  * This file do the common link for GLSL uniforms, using NIR, instead of IR as

src/compiler/glsl/gl_nir_linker.c

@@ -26,7 +26,8 @@
 #include "gl_nir.h"
 #include "gl_nir_linker.h"
 #include "linker_util.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 #include "main/shaderobj.h"
 #include "ir_uniform.h" /* for gl_uniform_storage */
 

src/compiler/glsl/gl_nir_lower_atomics.c

@@ -30,7 +30,7 @@
 #include "gl_nir.h"
 #include "ir_uniform.h"
 #include "main/config.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include <assert.h>
 
 /*

src/compiler/glsl/gl_nir_lower_buffers.c

@@ -27,7 +27,7 @@
 #include "ir_uniform.h"
 
 #include "util/compiler.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 static nir_ssa_def *
 get_block_array_index(nir_builder *b, nir_deref_instr *deref,

src/compiler/glsl/gl_nir_lower_samplers_as_deref.c

@@ -62,7 +62,7 @@
 #include "ir_uniform.h"
 
 #include "util/compiler.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 struct lower_samplers_as_deref_state {
    nir_shader *shader;

src/compiler/glsl/ir_set_program_inouts.cpp

@@ -37,7 +37,7 @@
 #include "ir.h"
 #include "ir_visitor.h"
 #include "compiler/glsl_types.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 namespace {
 

src/compiler/glsl/link_functions.cpp

@@ -28,7 +28,7 @@
 #include "util/set.h"
 #include "util/hash_table.h"
 #include "linker.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 static ir_function_signature *
 find_matching_signature(const char *name, const exec_list *actual_parameters,

src/compiler/glsl/link_interface_blocks.cpp

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

src/compiler/glsl/link_uniform_blocks.cpp

@@ -28,7 +28,8 @@
 #include "util/hash_table.h"
 #include "program.h"
 #include "main/errors.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 
 namespace {
 

src/compiler/glsl/link_uniform_initializers.cpp

@@ -25,7 +25,7 @@
 #include "linker.h"
 #include "ir_uniform.h"
 #include "string_to_uint_map.h"
-#include "main/mtypes.h"
+#include "main/shader_types.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

@@ -29,7 +29,8 @@
 #include "string_to_uint_map.h"
 #include "ir_array_refcount.h"
 
-#include "main/mtypes.h"
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 #include "util/strndup.h"
 
 /**

src/compiler/glsl/link_varyings.cpp

@@ -30,7 +30,8 @@
 
 
 #include "main/errors.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 #include "glsl_symbol_table.h"
 #include "glsl_parser_extras.h"
 #include "ir_optimization.h"

src/compiler/glsl/linker_util.cpp

@@ -21,12 +21,13 @@
  * IN THE SOFTWARE.
  *
  */
-#include "main/mtypes.h"
 #include "glsl_types.h"
 #include "linker_util.h"
 #include "util/bitscan.h"
 #include "util/set.h"
 #include "ir_uniform.h" /* for gl_uniform_storage */
+#include "main/shader_types.h"
+#include "main/consts_exts.h"
 
 /* Utility methods shared between the GLSL IR and the NIR */
 

src/compiler/glsl/linker_util.h

@@ -25,6 +25,7 @@
 #define GLSL_LINKER_UTIL_H
 
 #include "util/bitset.h"
+#include "compiler/glsl/list.h"
 
 struct gl_constants;
 struct gl_shader_program;

src/compiler/glsl/loop_unroll.cpp

@@ -24,8 +24,7 @@
 #include "compiler/glsl_types.h"
 #include "loop_analysis.h"
 #include "ir_hierarchical_visitor.h"
-
+#include "main/consts_exts.h"
-#include "main/mtypes.h"
 
 namespace {
 

src/compiler/glsl/lower_blend_equation_advanced.cpp

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

src/compiler/glsl/lower_cs_derived.cpp

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

src/compiler/glsl/lower_distance.cpp

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

src/compiler/glsl/lower_named_interface_blocks.cpp

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

src/compiler/glsl/lower_packed_varyings.cpp

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

src/compiler/glsl/lower_precision.cpp

@@ -26,7 +26,7 @@
  */
 
 #include "main/macros.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
 #include "compiler/glsl_types.h"
 #include "ir.h"
 #include "ir_builder.h"

src/compiler/glsl/lower_shared_reference.cpp

@@ -36,8 +36,9 @@
 #include "linker.h"
 #include "main/macros.h"
 #include "util/list.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 #include "glsl_parser_extras.h"
-#include "main/mtypes.h"
 
 using namespace ir_builder;
 

src/compiler/glsl/lower_tess_level.cpp

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

src/compiler/glsl/lower_ubo_reference.cpp

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

src/compiler/glsl/lower_vector_derefs.cpp

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

src/compiler/glsl/lower_vertex_id.cpp

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

src/compiler/glsl/lower_xfb_varying.cpp

@@ -27,7 +27,7 @@
  */
 
 #include "ir.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "glsl_symbol_table.h"
 #include "util/strndup.h"
 

src/compiler/glsl/opt_algebraic.cpp

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

src/compiler/glsl/opt_dead_builtin_varyings.cpp

@@ -52,7 +52,8 @@
 #include "ir_print_visitor.h"
 #include "compiler/glsl_types.h"
 #include "link_varyings.h"
-#include "main/mtypes.h"
+#include "main/consts_exts.h"
+#include "main/shader_types.h"
 #include "util/u_string.h"
 
 namespace {

src/compiler/glsl/tests/copy_constant_to_storage_tests.cpp

@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "uniform_initializer_utils.h"

src/compiler/glsl/tests/general_ir_test.cpp

@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"
 

src/compiler/glsl/tests/invalidate_locations_test.cpp

@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "ir.h"

src/compiler/glsl/tests/lower_int64_test.cpp

@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"
 #include "ir_builder.h"

src/compiler/glsl/tests/sampler_types_test.cpp

@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "ir.h"
 

src/compiler/glsl/tests/set_uniform_initializer_tests.cpp

@@ -22,7 +22,7 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "string_to_uint_map.h"

src/compiler/glsl/tests/uniform_initializer_utils.cpp

@@ -21,7 +21,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 #include <gtest/gtest.h>
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "uniform_initializer_utils.h"

src/compiler/glsl/tests/varyings_test.cpp

@@ -22,7 +22,6 @@
  */
 #include <gtest/gtest.h>
 #include "util/compiler.h"
-#include "main/mtypes.h"
 #include "main/macros.h"
 #include "util/ralloc.h"
 #include "ir.h"