diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-05-31 18:35:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-05-31 18:35:16 +0300 |
| commit | 610619c2031056330f174bcee590c363cb6b45fc (patch) | |
| tree | c727cba5259db3f9cf1b754267961d955a96e25e /intern/cycles/device/cuda/device_impl.cpp | |
| parent | a40b6111283186b188864cd427ac2ec2970acfef (diff) | |
| parent | f2cd7e08fed02fdf02060c17c943e15e85638cb5 (diff) | |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'intern/cycles/device/cuda/device_impl.cpp')
| -rw-r--r-- | intern/cycles/device/cuda/device_impl.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/device/cuda/device_impl.cpp b/intern/cycles/device/cuda/device_impl.cpp index 75177566901..cb7e909a2d5 100644 --- a/intern/cycles/device/cuda/device_impl.cpp +++ b/intern/cycles/device/cuda/device_impl.cpp @@ -457,6 +457,8 @@ void CUDADevice::reserve_local_memory(const uint kernel_features) /* Use the biggest kernel for estimation. */ const DeviceKernel test_kernel = (kernel_features & KERNEL_FEATURE_NODE_RAYTRACE) ? DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_RAYTRACE : + (kernel_features & KERNEL_FEATURE_MNEE) ? + DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE_MNEE : DEVICE_KERNEL_INTEGRATOR_SHADE_SURFACE; /* Launch kernel, using just 1 block appears sufficient to reserve memory for all |