diff options
| author | Eric Anholt <[email protected]> | 2016-08-05 23:45:37 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2016-08-19 13:11:36 -0700 |
| commit | 24728637e2c006012e4c0a3d87629b53beaddd3b (patch) | |
| tree | 916ce785e77e5f688661e39f816c14351b6a127a /src/compiler | |
| parent | c078c41520214baf469dd4413f868e42c2959c5e (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir.h | 3 | ||||
| -rw-r--r-- | 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 9ce5be2176d..e09cf3b8109 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 42c770f1594..d0f7f5db833 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 |