Mesa (master): nir: include what we want/need

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 0572e5fea57dc918ac40e5b06de33110738f717e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0572e5fea57dc918ac40e5b06de33110738f717e

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue Nov 24 15:33:45 2015 +0000

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 at collabora.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>

---

 src/glsl/nir/glsl_types.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/glsl/nir/glsl_types.cpp b/src/glsl/nir/glsl_types.cpp
index 9cc3715..3cf2f03 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"