diff options
| author | Michael Jones <michael_p_jones@apple.com> | 2021-11-29 18:06:22 +0300 |
|---|---|---|
| committer | Michael Jones <michael_p_jones@apple.com> | 2021-11-29 18:20:26 +0300 |
| commit | f613c4c0953ebaf993ecd55b12bab9cf2196dac4 (patch) | |
| tree | 0cb08f0e144290913b483289220f13c366665504 /intern/cycles/kernel/types.h | |
| parent | 98a5c924fca00b4b39e75a4fc16585cfa040398c (diff) | |
Cycles: MetalRT support (kernel side)
This patch adds MetalRT support to Cycles kernel code. It is mostly additive in nature or confined to Metal-specific code, however there are a few areas where this interacts with other code:
- MetalRT closely follows the Optix implementation, and in some cases (notably handling of transforms) it makes sense to extend Optix special-casing to MetalRT. For these generalisations we now have `__KERNEL_GPU_RAYTRACING__` instead of `__KERNEL_OPTIX__`.
- MetalRT doesn't support primitive offsetting (as with `primitiveIndexOffset` in Optix), so we define and populate a new kernel texture, `__object_prim_offset`, containing per-object primitive / curve-segment offsets. This is referenced and applied in MetalRT intersection handlers.
- Two new BVH layout enum values have been added: `BVH_LAYOUT_METAL` and `BVH_LAYOUT_MULTI_METAL_EMBREE` for XPU mode). Some host-side enum case handling has been updated where it is trivial to do so.
Ref T92212
Reviewed By: brecht
Maniphest Tasks: T92212
Differential Revision: https://developer.blender.org/D13353
Diffstat (limited to 'intern/cycles/kernel/types.h')
| -rw-r--r-- | intern/cycles/kernel/types.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/intern/cycles/kernel/types.h b/intern/cycles/kernel/types.h index 4a730dbfaaa..b15230e627f 100644 --- a/intern/cycles/kernel/types.h +++ b/intern/cycles/kernel/types.h @@ -110,9 +110,9 @@ CCL_NAMESPACE_BEGIN # define __VOLUME_RECORD_ALL__ #endif /* __KERNEL_CPU__ */ -#ifdef __KERNEL_OPTIX__ +#ifdef __KERNEL_GPU_RAYTRACING__ # undef __BAKING__ -#endif /* __KERNEL_OPTIX__ */ +#endif /* __KERNEL_GPU_RAYTRACING__ */ /* Scene-based selective features compilation. */ #ifdef __KERNEL_FEATURES__ @@ -1220,10 +1220,12 @@ typedef enum KernelBVHLayout { BVH_LAYOUT_OPTIX = (1 << 2), BVH_LAYOUT_MULTI_OPTIX = (1 << 3), BVH_LAYOUT_MULTI_OPTIX_EMBREE = (1 << 4), + BVH_LAYOUT_METAL = (1 << 5), + BVH_LAYOUT_MULTI_METAL_EMBREE = (1 << 6), /* Default BVH layout to use for CPU. */ BVH_LAYOUT_AUTO = BVH_LAYOUT_EMBREE, - BVH_LAYOUT_ALL = BVH_LAYOUT_BVH2 | BVH_LAYOUT_EMBREE | BVH_LAYOUT_OPTIX, + BVH_LAYOUT_ALL = BVH_LAYOUT_BVH2 | BVH_LAYOUT_EMBREE | BVH_LAYOUT_OPTIX | BVH_LAYOUT_METAL, } KernelBVHLayout; typedef struct KernelBVH { @@ -1238,6 +1240,8 @@ typedef struct KernelBVH { /* Custom BVH */ #ifdef __KERNEL_OPTIX__ OptixTraversableHandle scene; +#elif defined __METALRT__ + metalrt_as_type scene; #else # ifdef __EMBREE__ RTCScene scene; |