From 4346f392993855ed4debba43032a498e2cd53ee4 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 7 Jan 2022 16:27:02 +1000 Subject: [PATCH] mesa: more mtypes.h cleanups Add more from pepp Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mesa/main/es1_conversion.c | 1 - src/mesa/main/shaderapi.h | 4 +++- src/mesa/program/arbprogparse.c | 1 - src/mesa/program/prog_cache.c | 2 +- src/mesa/program/prog_parameter_layout.c | 2 +- src/mesa/program/prog_statevars.c | 1 - src/mesa/program/prog_to_nir.c | 2 +- src/mesa/program/prog_to_nir.h | 1 - src/mesa/state_tracker/st_atom_sampler.c | 1 - src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 1 - src/mesa/state_tracker/st_glsl_to_tgsi.h | 2 +- src/mesa/state_tracker/st_program.h | 1 - src/mesa/state_tracker/st_shader_cache.h | 1 - 13 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index 6ddd27ced09..2d1362e0a6e 100644 --- a/src/mesa/main/es1_conversion.c +++ b/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" diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index 6c1600ed0f7..66fa37c19f5 100644 --- a/src/mesa/main/shaderapi.h +++ b/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); diff --git a/src/mesa/program/arbprogparse.c b/src/mesa/program/arbprogparse.c index 42f84944a1e..d1623d281af 100644 --- a/src/mesa/program/arbprogparse.c +++ b/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" diff --git a/src/mesa/program/prog_cache.c b/src/mesa/program/prog_cache.c index b87ce1a7074..14f471ec607 100644 --- a/src/mesa/program/prog_cache.c +++ b/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" diff --git a/src/mesa/program/prog_parameter_layout.c b/src/mesa/program/prog_parameter_layout.c index d94b1207c93..be97a6a7deb 100644 --- a/src/mesa/program/prog_parameter_layout.c +++ b/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" diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index a9d4d78a428..b288bd29793 100644 --- a/src/mesa/program/prog_statevars.c +++ b/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" diff --git a/src/mesa/program/prog_to_nir.c b/src/mesa/program/prog_to_nir.c index c5dd37fd976..82381065057 100644 --- a/src/mesa/program/prog_to_nir.c +++ b/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" diff --git a/src/mesa/program/prog_to_nir.h b/src/mesa/program/prog_to_nir.h index cfdfc64cd91..aab0d835069 100644 --- a/src/mesa/program/prog_to_nir.h +++ b/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 diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 5c314d3c75b..babf51535ef 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/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" diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 386265ca290..8fcd1964f33 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/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" diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.h b/src/mesa/state_tracker/st_glsl_to_tgsi.h index dda75ee93b8..d87571eb028 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.h +++ b/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" { diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index 37897cf0905..a0b34b54457 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/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" diff --git a/src/mesa/state_tracker/st_shader_cache.h b/src/mesa/state_tracker/st_shader_cache.h index 2a74ea1e90a..95a5089665f 100644 --- a/src/mesa/state_tracker/st_shader_cache.h +++ b/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"