diff options
| author | Jason Ekstrand <[email protected]> | 2016-02-12 21:34:59 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2016-02-12 21:35:02 -0800 |
| commit | 88042b9f1087460e3c1a7cf81a29aa536572bc17 (patch) | |
| tree | 560ddf4b02e742dd898652bf5a0352a52c18e1aa | |
| parent | c136672c593399e831db0da8b8cc6d8a5d73c1d3 (diff) | |
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.
| -rw-r--r-- | src/compiler/nir/nir.h | 12 |
1 files changed, 2 insertions, 10 deletions
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) |