diff options
author | Michael Jones <michael_jones> | 2021-11-16 16:41:29 +0300 |
---|---|---|
committer | Michael Jones <michael_p_jones@apple.com> | 2021-11-16 16:42:23 +0300 |
commit | 64003fa4b0b1699998a5b048d980eb775d547d8d (patch) | |
tree | 0cc713ee41879893f0c41a0f559bd650b9a74285 /intern/cycles/kernel/types.h | |
parent | 85ac9b8584ca99648616f25146412009f05f1278 (diff) |
Cycles: Adapt volumetric lambda functions to work on MSL
This patch adapts the existing volumetric read/write lambda functions for Metal. Lambda expressions are not supported on MSL, so two new macros `VOLUME_READ_LAMBDA` and `VOLUME_WRITE_LAMBDA` have been defined with a default implementation which, on Metal, is overridden to use inline function objects.
This patch also removes the last remaining mention of the now-unused `ccl_addr_space`.
Ref T92212
Reviewed By: leesonw
Maniphest Tasks: T92212
Differential Revision: https://developer.blender.org/D13234
Diffstat (limited to 'intern/cycles/kernel/types.h')
-rw-r--r-- | intern/cycles/kernel/types.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 495838adfe9..196c7c92a80 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -36,13 +36,6 @@ # define __KERNEL_CPU__ #endif -/* TODO(sergey): This is only to make it possible to include this header - * from outside of the kernel. but this could be done somewhat cleaner? - */ -#ifndef ccl_addr_space -# define ccl_addr_space -#endif - CCL_NAMESPACE_BEGIN /* Constants */ |