Mesa (main): brw/compiler: drop mtypes.h from compiler

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9265d1d62db41f2693ff42db2284eb1765eb8469
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9265d1d62db41f2693ff42db2284eb1765eb8469

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Dec  7 16:34:48 2021 +1000

brw/compiler: drop mtypes.h from compiler

This adds a bunch of other headers in, and adds mtypes.h to iris
for perf query object.

Reviewed-by: Caio Oliveira <caio.oliveira at intel.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14104>

---

 src/gallium/drivers/iris/iris_performance_query.c | 2 ++
 src/intel/compiler/brw_compiler.h                 | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/iris/iris_performance_query.c b/src/gallium/drivers/iris/iris_performance_query.c
index 8e8d8bf9357..d4a1d46b308 100644
--- a/src/gallium/drivers/iris/iris_performance_query.c
+++ b/src/gallium/drivers/iris/iris_performance_query.c
@@ -25,6 +25,8 @@
 #include "iris_context.h"
 #include "iris_perf.h"
 
+#include "main/mtypes.h"
+
 struct iris_perf_query {
    struct gl_perf_query_object base;
    struct intel_perf_query_object *query;
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 2d9d468b034..2fd94315d1f 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -26,9 +26,12 @@
 
 #include <stdio.h>
 #include "dev/intel_device_info.h"
+#include "main/glheader.h"
 #include "main/macros.h"
-#include "main/mtypes.h"
+#include "main/config.h"
 #include "util/ralloc.h"
+#include "compiler/shader_info.h"
+#include "util/u_math.h"
 
 #ifdef __cplusplus
 extern "C" {