diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 02:23:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-13 12:40:41 +0300 |
| commit | 0cf2fafd81442518927a594e422ad2b26b54527a (patch) | |
| tree | 384b7252bb2fd4440dbe6779ee619c81bfa07206 | |
| parent | a3deef6fff7c395512cf56a64d6e026f84d95db2 (diff) | |
Fix T94050, T94570, T94527: Cycles Bevel and AO nodes not working with Metal
Workaround what may be a compiler bug, solution found by Michael Jones.
| -rw-r--r-- | intern/cycles/kernel/device/gpu/kernel.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h index 00c727b48cb..eed005803e2 100644 --- a/intern/cycles/kernel/device/gpu/kernel.h +++ b/intern/cycles/kernel/device/gpu/kernel.h @@ -243,6 +243,10 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) } } +#ifdef __KERNEL_METAL__ +constant int __dummy_constant [[function_constant(0)]]; +#endif + ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) ccl_gpu_kernel_signature(integrator_shade_surface_raytrace, ccl_global const int *path_index_array, @@ -253,7 +257,16 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) if (global_index < work_size) { const int state = (path_index_array) ? path_index_array[global_index] : global_index; + +#ifdef __KERNEL_METAL__ + KernelGlobals kg = NULL; + /* Workaround Ambient Occlusion and Bevel nodes not working with Metal. + * Dummy offset should not affect result, but somehow fixes bug! */ + kg += __dummy_constant; + ccl_gpu_kernel_call(integrator_shade_surface_raytrace(kg, state, render_buffer)); +#else ccl_gpu_kernel_call(integrator_shade_surface_raytrace(NULL, state, render_buffer)); +#endif } } |