diff options
| author | Jeroen Bakker <jbakker> | 2020-11-23 18:36:00 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-11-23 18:36:15 +0300 |
| commit | 8351760ed0816cf5e4ca9fb0f08be717f733d34a (patch) | |
| tree | 5c92f8b7048b98e7c65a82641278f7335c597465 | |
| parent | 1f09dcc121ab31fe08c76947820ed59ec8f76788 (diff) | |
Cycles: Remove Compilation Warning
ROCm 3.9 already defined `NULL`. This patch will first check if it was
already defined to remove compilation warnings.
NOTE: This doesn't add official support for ROCm as it still fails to
render correctly (crashes with default cube).
Reviewed By: Brecht van Lommel
Differential Revision: https://developer.blender.org/D9610
| -rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 1848f6059b6..4a9304a134c 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -162,7 +162,9 @@ #define kernel_tex_fetch(tex, index) kernel_tex_array(tex)[(index)] /* define NULL */ -#define NULL 0 +#ifndef NULL +# define NULL ((void *)0) +#endif /* enable extensions */ #ifdef __KERNEL_CL_KHR_FP16__ |