From 88042b9f1087460e3c1a7cf81a29aa536572bc17 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 12 Feb 2016 21:34:59 -0800 Subject: nir: Get rid of the C++ NIR_SRC/DEST_INIT macros These were originally added to reduce compiler warnings but aren't really needed. Getting rid of them reduces the diff between the Vulkan branch and master, so we might as well. --- src/compiler/nir/nir.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index c2e9e6fb2fb..9c478870626 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -526,11 +526,7 @@ typedef struct nir_src { bool is_ssa; } nir_src; -#ifdef __cplusplus -# define NIR_SRC_INIT nir_src() -#else -# define NIR_SRC_INIT (nir_src) { { NULL } } -#endif +#define NIR_SRC_INIT (nir_src) { { NULL } } #define nir_foreach_use(reg_or_ssa_def, src) \ list_for_each_entry(nir_src, src, &(reg_or_ssa_def)->uses, use_link) @@ -553,11 +549,7 @@ typedef struct { bool is_ssa; } nir_dest; -#ifdef __cplusplus -# define NIR_DEST_INIT nir_dest() -#else -# define NIR_DEST_INIT (nir_dest) { { { NULL } } } -#endif +#define NIR_DEST_INIT (nir_dest) { { { NULL } } } #define nir_foreach_def(reg, dest) \ list_for_each_entry(nir_dest, dest, &(reg)->defs, reg.def_link) -- cgit v1.2.3