Mesa (main): intel/crocus: push main/macros.h out to the users

[GitLab Mirror]

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

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

intel/crocus: push main/macros.h out to the users

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/crocus/crocus_state.c | 1 +
 src/intel/compiler/brw_compiler.h         | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/crocus/crocus_state.c b/src/gallium/drivers/crocus/crocus_state.c
index 34b3755cd41..a6bd2d8d41a 100644
--- a/src/gallium/drivers/crocus/crocus_state.c
+++ b/src/gallium/drivers/crocus/crocus_state.c
@@ -112,6 +112,7 @@
 
 #include "crocus_genx_macros.h"
 #include "intel/common/intel_guardband.h"
+#include "main/macros.h" /* UNCLAMPED_* */
 
 /**
  * Statically assert that PIPE_* enums match the hardware packets.
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 63fe7d9944b..4c932fb46a4 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include "dev/intel_device_info.h"
 #include "main/glheader.h"
-#include "main/macros.h"
 #include "main/config.h"
 #include "util/ralloc.h"
 #include "util/u_math.h"