I wanted to include this from nir_builder as well, so it also needed the undefs. --- 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 379a5f8e022e..5e527d8add12 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 42c770f15942..d0f7f5db8337 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 -- 2.8.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev