summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2015-11-24 15:33:45 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2015-11-25 20:19:47 +0000
commit0572e5fea57dc918ac40e5b06de33110738f717e (patch)
treefbfc48f7232fff74fe88990fc6bf851d85a20c68
parent3810c1561401aba336765d64d1a5a3e44eb58eb3 (diff)
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>
-rw-r--r--src/glsl/nir/glsl_types.cpp2
1 files changed, 1 insertions, 1 deletions
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"