From b40958cbff2c8e3606505558729f1e65434fbca8 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 7 Jan 2022 14:15:16 +1000 Subject: [PATCH] glsl: remove some deps on mtypes.h. This should reduce having to rebuild parts of the GLSL compiler when mtypes.h changes. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/compiler/glsl/builtin_types.cpp | 2 +- src/compiler/glsl/builtin_variables.cpp | 3 ++- src/compiler/glsl/glsl_lexer.ll | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/compiler/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp index ae5bf165cfc..bfb82870a00 100644 --- a/src/compiler/glsl/builtin_types.cpp +++ b/src/compiler/glsl/builtin_types.cpp @@ -37,7 +37,7 @@ #include "compiler/glsl_types.h" #include "glsl_parser_extras.h" #include "util/macros.h" -#include "main/mtypes.h" +#include "main/consts_exts.h" /** * Declarations of type flyweights (glsl_type::_foo_type) and diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 51d2b85810f..7afb013b8e3 100644 --- a/src/compiler/glsl/builtin_variables.cpp +++ b/src/compiler/glsl/builtin_variables.cpp @@ -41,10 +41,11 @@ #include "linker.h" #include "glsl_parser_extras.h" #include "glsl_symbol_table.h" -#include "main/mtypes.h" +#include "main/consts_exts.h" #include "main/uniforms.h" #include "program/prog_statevars.h" #include "program/prog_instruction.h" +#include "util/compiler.h" #include "builtin_functions.h" using namespace ir_builder; diff --git a/src/compiler/glsl/glsl_lexer.ll b/src/compiler/glsl/glsl_lexer.ll index ed393ec461e..34e175f8cde 100644 --- a/src/compiler/glsl/glsl_lexer.ll +++ b/src/compiler/glsl/glsl_lexer.ll @@ -27,7 +27,7 @@ #include "ast.h" #include "glsl_parser_extras.h" #include "glsl_parser.h" -#include "main/mtypes.h" +#include "main/consts_exts.h" static int classify_identifier(struct _mesa_glsl_parse_state *, const char *, unsigned name_len, YYSTYPE *output);