From: Emil Velikov <emil.velikov@collabora.com>
Date: Tue, 24 Nov 2015 15:33:45 +0000 (+0000)
Subject: nir: include what we want/need
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0572e5fea57dc918ac40e5b06de33110738f717e;p=mesa.git

nir: include what we want/need

Swap core.h with macros.h, as the latter provides the required MAX2
macro.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@intel.com>
---

diff --git a/src/glsl/nir/glsl_types.cpp b/src/glsl/nir/glsl_types.cpp
index 9cc3715db8a..3cf2f03f9ba 100644
--- a/src/glsl/nir/glsl_types.cpp
+++ b/src/glsl/nir/glsl_types.cpp
@@ -22,7 +22,7 @@
  */
 
 #include <stdio.h>
-#include "main/core.h" /* for Elements, MAX2 */
+#include "main/macros.h"
 #include "glsl_parser_extras.h"
 #include "glsl_types.h"
 #include "util/hash_table.h"