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/device/metal/compat.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/device/metal/compat.h')
-rw-r--r-- | intern/cycles/kernel/device/metal/compat.h | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/intern/cycles/kernel/device/metal/compat.h b/intern/cycles/kernel/device/metal/compat.h index 61597a4acfc..a80965ba267 100644 --- a/intern/cycles/kernel/device/metal/compat.h +++ b/intern/cycles/kernel/device/metal/compat.h @@ -32,6 +32,10 @@ using namespace metal; +#ifdef __METALRT__ +using namespace metal::raytracing; +#endif + #pragma clang diagnostic ignored "-Wunused-variable" #pragma clang diagnostic ignored "-Wsign-compare" #pragma clang diagnostic ignored "-Wuninitialized" @@ -47,7 +51,7 @@ using namespace metal; #define ccl_global device #define ccl_inline_constant static constant constexpr #define ccl_device_constant constant -#define ccl_constant const device +#define ccl_constant constant #define ccl_gpu_shared threadgroup #define ccl_private thread #define ccl_may_alias @@ -246,6 +250,22 @@ void kernel_gpu_##name::run(thread MetalKernelContext& context, \ #define __device__ +#ifdef __METALRT__ + +# define __KERNEL_GPU_RAYTRACING__ + +# if defined(__METALRT_MOTION__) +# define METALRT_TAGS instancing, instance_motion, primitive_motion +# else +# define METALRT_TAGS instancing +# endif /* __METALRT_MOTION__ */ + +typedef acceleration_structure<METALRT_TAGS> metalrt_as_type; +typedef intersection_function_table<triangle_data, METALRT_TAGS> metalrt_ift_type; +typedef metal::raytracing::intersector<triangle_data, METALRT_TAGS> metalrt_intersector_type; + +#endif /* __METALRT__ */ + /* texture bindings and sampler setup */ struct Texture2DParamsMetal { @@ -258,6 +278,13 @@ struct Texture3DParamsMetal { struct MetalAncillaries { device Texture2DParamsMetal *textures_2d; device Texture3DParamsMetal *textures_3d; + +#ifdef __METALRT__ + metalrt_as_type accel_struct; + metalrt_ift_type ift_default; + metalrt_ift_type ift_shadow; + metalrt_ift_type ift_local; +#endif }; #include "util/half.h" |