diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-03-26 20:41:44 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-03-26 20:41:44 +0300 |
| commit | 86c61ce64f6e8c921d8770fcd42ed2c21d01ca3a (patch) | |
| tree | e13f1941567bffbc159063a6891431ee9b158bac /intern/cycles/util | |
| parent | 58ea0d93f193adf84162d736c3c69500584e1aef (diff) | |
Cycles: Restore cycles_cubin_cc to working order
Reviewed by: brecht pmoursnv
Differential Revision: https://developer.blender.org/D7136
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_static_assert.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_static_assert.h b/intern/cycles/util/util_static_assert.h index 2dca1d64a76..d809f2e06d7 100644 --- a/intern/cycles/util/util_static_assert.h +++ b/intern/cycles/util/util_static_assert.h @@ -24,9 +24,9 @@ CCL_NAMESPACE_BEGIN -#ifdef __KERNEL_OPENCL__ +#if defined(__KERNEL_OPENCL__) || defined(CYCLES_CUBIN_CC) # define static_assert(statement, message) -#endif /* __KERNEL_GPU__ */ +#endif /* __KERNEL_OPENCL__ */ #define static_assert_align(st, align) \ static_assert((sizeof(st) % (align) == 0), "Structure must be strictly aligned") // NOLINT |