blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Julian Eisel 2020-05-07 14:40:55 +02:00
parent 6e0540671c 1c0e22b982
commit 9b7754883b
Notes: blender-bot 2023-02-14 05:12:59 +01:00 
Referenced by issue #76471, Crash on BLI_assert(sfile->previews_timer == NULL);
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
intern/cycles/kernel/kernel_compat_opencl.h
View File

@ -43,12 +43,17 @@
#define ccl_local __local
#define ccl_local_param __local
#define ccl_private __private
#define ccl_loop_no_unroll __attribute__((opencl_unroll_hint(1)))
#define ccl_restrict restrict
#define ccl_ref
#define ccl_align(n) __attribute__((aligned(n)))
#define ccl_optional_struct_init
#if __OPENCL_VERSION__ >= 200
# define ccl_loop_no_unroll __attribute__((opencl_unroll_hint(1)))
#else
# define ccl_loop_no_unroll
#endif
#ifdef __SPLIT_KERNEL__
# define ccl_addr_space __global
#else