Mesa (master): nir: Move the undef of nir_intrinsics.h macros to the .h.

[Eric Anholt]

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

Author: Eric Anholt <eric at anholt.net>
Date:   Fri Aug  5 23:45:37 2016 -0700

nir: Move the undef of nir_intrinsics.h macros to the .h.

I wanted to include this from nir_builder as well, so it also needed the
undefs.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/compiler/nir/nir.h            | 3 ---
 src/compiler/nir/nir_intrinsics.h | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 9ce5be2..e09cf3b 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -868,9 +868,6 @@ typedef enum {
    nir_num_intrinsics = nir_last_intrinsic + 1
 } nir_intrinsic_op;
 
-#undef INTRINSIC
-#undef LAST_INTRINSIC
-
 #define NIR_INTRINSIC_MAX_CONST_INDEX 3
 
 /** Represents an intrinsic
diff --git a/src/compiler/nir/nir_intrinsics.h b/src/compiler/nir/nir_intrinsics.h
index 42c770f..d0f7f5d 100644
--- a/src/compiler/nir/nir_intrinsics.h
+++ b/src/compiler/nir/nir_intrinsics.h
@@ -405,3 +405,6 @@ STORE(ssbo, 3, 1, WRMASK, xx, xx, 0)
 STORE(shared, 2, 2, BASE, WRMASK, xx, 0)
 
 LAST_INTRINSIC(store_shared)
+
+#undef INTRINSIC
+#undef LAST_INTRINSIC