griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles oneAPI build error due to conflicting CONSTANT define

Browse Source
This commit is contained in:
Brecht Van Lommel
2023-03-06 00:12:31 +01:00
parent 7d5754b8b6
commit 9eee008691
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/kernel/device/oneapi/compat.h
View File

@@ -150,18 +150,18 @@ void oneapi_kernel_##name(KernelGlobalsGPU *ccl_restrict kg, \
/* Debug defines */
#if defined(__SYCL_DEVICE_ONLY__)
# define CONSTANT __attribute__((opencl_constant))
# define CCL_ONEAPI_CONSTANT __attribute__((opencl_constant))
#else
# define CONSTANT
# define CCL_ONEAPI_CONSTANT
#endif
#define sycl_printf(format, ...) { \
static const CONSTANT char fmt[] = format; \
static const CCL_ONEAPI_CONSTANT char fmt[] = format; \
sycl::ext::oneapi::experimental::printf(fmt, __VA_ARGS__ ); \
}
#define sycl_printf_(format) { \
static const CONSTANT char fmt[] = format; \
static const CCL_ONEAPI_CONSTANT char fmt[] = format; \
sycl::ext::oneapi::experimental::printf(fmt); \
}