mesa: more mtypes.h cleanups

Add more from pepp

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

src/mesa/main/es1_conversion.c

@@ -17,7 +17,6 @@
 #include "polygon.h"
 #include "readpix.h"
 #include "texparam.h"
-#include "mtypes.h"
 #include "viewport.h"
 #include "vbo/vbo.h"
 #include "api_exec_decl.h"

src/mesa/main/shaderapi.h

@@ -29,7 +29,6 @@
 
 
 #include "glheader.h"
-#include "main/mtypes.h"
 #include "compiler/shader_enums.h"
 #include "util/mesa-sha1.h"
 
@@ -46,6 +45,9 @@ struct gl_program;
 struct gl_program_resource;
 struct gl_shader;
 struct gl_shader_program;
+struct gl_resource_name;
+struct gl_shared_state;
+struct gl_uniform_block;
 
 extern GLbitfield
 _mesa_get_shader_flags(void);

src/mesa/program/arbprogparse.c

@@ -54,7 +54,6 @@ having three separate program parameter arrays.
 #include "main/glheader.h"
 
 #include "main/context.h"
-#include "main/mtypes.h"
 #include "arbprogparse.h"
 #include "programopt.h"
 #include "prog_parameter.h"

src/mesa/program/prog_cache.c

@@ -27,7 +27,7 @@
 
 
 #include "main/glheader.h"
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 
 #include "main/shaderobj.h"
 #include "program/prog_cache.h"

src/mesa/program/prog_parameter_layout.c

@@ -29,7 +29,7 @@
  */
 
 
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "prog_parameter.h"
 #include "prog_parameter_layout.h"
 #include "prog_instruction.h"

src/mesa/program/prog_statevars.c

@@ -36,7 +36,6 @@
 #include "main/blend.h"
 
 #include "main/macros.h"
-#include "main/mtypes.h"
 #include "main/fbobject.h"
 #include "prog_statevars.h"
 #include "prog_parameter.h"

src/mesa/program/prog_to_nir.c

@@ -27,7 +27,7 @@
 #include "compiler/nir/nir_builder.h"
 #include "compiler/glsl/list.h"
 
-#include "main/mtypes.h"
+#include "main/shader_types.h"
 #include "util/ralloc.h"
 
 #include "prog_to_nir.h"

src/mesa/program/prog_to_nir.h

@@ -24,7 +24,6 @@
 #ifndef PROG_TO_NIR_H
 #define PROG_TO_NIR_H
 
-#include "main/mtypes.h"
 #include "compiler/nir/nir.h"
 
 #ifdef __cplusplus

src/mesa/state_tracker/st_atom_sampler.c

@@ -33,7 +33,6 @@
  
 
 #include "main/macros.h"
-#include "main/mtypes.h"
 #include "main/glformats.h"
 #include "main/samplerobj.h"
 #include "main/teximage.h"

src/mesa/state_tracker/st_glsl_to_tgsi.cpp

@@ -43,7 +43,6 @@
 #include "main/shaderobj.h"
 #include "main/uniforms.h"
 #include "main/shaderapi.h"
-#include "main/shaderimage.h"
 #include "program/prog_instruction.h"
 
 #include "pipe/p_context.h"

src/mesa/state_tracker/st_glsl_to_tgsi.h

@@ -25,9 +25,9 @@
 #ifndef ST_GLSL_TO_TGSI_H
 #define ST_GLSL_TO_TGSI_H
 
+#include "main/glheader.h"
 #include "pipe/p_defines.h"
 #include "pipe/p_shader_tokens.h"
-#include "main/mtypes.h"
 
 #ifdef __cplusplus
 extern "C" {

src/mesa/state_tracker/st_program.h

@@ -34,7 +34,6 @@
 #ifndef ST_PROGRAM_H
 #define ST_PROGRAM_H
 
-#include "main/mtypes.h"
 #include "main/atifragshader.h"
 #include "program/program.h"
 #include "pipe/p_state.h"

src/mesa/state_tracker/st_shader_cache.h

@@ -25,7 +25,6 @@
 #define ST_SHADER_CACHE_H
 
 #include "st_context.h"
-#include "main/mtypes.h"
 #include "pipe/p_state.h"
 #include "util/blob.h"
 #include "util/disk_cache.h"