diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-11-11 17:29:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-11-11 17:29:35 +0300 |
| commit | ce395c84a34225a820002ad551bee324b072f034 (patch) | |
| tree | b981bdd0a69272abb6c0aaf1e7cb4f2530f7e254 /intern/cycles/kernel/device | |
| parent | 06a74e78169ff60082716c0bd85c0b76de6bb885 (diff) | |
| parent | d26d3cfe193793728cac77be9b44463a84a0f57e (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/kernel/device')
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/cpu/kernel_arch_impl.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/gpu/kernel.h | 3 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/optix/kernel.cu | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/kernel/device/cpu/kernel_arch.h b/intern/cycles/kernel/device/cpu/kernel_arch.h index 2f9a3f7c59d..61f62f3136b 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch.h @@ -37,7 +37,7 @@ KERNEL_INTEGRATOR_INIT_FUNCTION(init_from_camera); KERNEL_INTEGRATOR_INIT_FUNCTION(init_from_bake); -KERNEL_INTEGRATOR_FUNCTION(intersect_closest); +KERNEL_INTEGRATOR_SHADE_FUNCTION(intersect_closest); KERNEL_INTEGRATOR_FUNCTION(intersect_shadow); KERNEL_INTEGRATOR_FUNCTION(intersect_subsurface); KERNEL_INTEGRATOR_FUNCTION(intersect_volume_stack); diff --git a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h index 1ea5002e300..747c47c34c9 100644 --- a/intern/cycles/kernel/device/cpu/kernel_arch_impl.h +++ b/intern/cycles/kernel/device/cpu/kernel_arch_impl.h @@ -112,7 +112,7 @@ CCL_NAMESPACE_BEGIN DEFINE_INTEGRATOR_INIT_KERNEL(init_from_camera) DEFINE_INTEGRATOR_INIT_KERNEL(init_from_bake) -DEFINE_INTEGRATOR_KERNEL(intersect_closest) +DEFINE_INTEGRATOR_SHADE_KERNEL(intersect_closest) DEFINE_INTEGRATOR_KERNEL(intersect_subsurface) DEFINE_INTEGRATOR_KERNEL(intersect_volume_stack) DEFINE_INTEGRATOR_SHADE_KERNEL(shade_background) diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h index d63cd0e8262..dd0c6dd6893 100644 --- a/intern/cycles/kernel/device/gpu/kernel.h +++ b/intern/cycles/kernel/device/gpu/kernel.h @@ -131,13 +131,14 @@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS) ccl_gpu_kernel_signature(integrator_intersect_closest, ccl_global const int *path_index_array, + ccl_global float *render_buffer, const int work_size) { const int global_index = ccl_gpu_global_id_x(); if (global_index < work_size) { const int state = (path_index_array) ? path_index_array[global_index] : global_index; - ccl_gpu_kernel_call(integrator_intersect_closest(NULL, state)); + ccl_gpu_kernel_call(integrator_intersect_closest(NULL, state, render_buffer)); } } diff --git a/intern/cycles/kernel/device/optix/kernel.cu b/intern/cycles/kernel/device/optix/kernel.cu index 6989219cd9f..b987aa7a817 100644 --- a/intern/cycles/kernel/device/optix/kernel.cu +++ b/intern/cycles/kernel/device/optix/kernel.cu @@ -57,7 +57,7 @@ extern "C" __global__ void __raygen__kernel_optix_integrator_intersect_closest() const int global_index = optixGetLaunchIndex().x; const int path_index = (__params.path_index_array) ? __params.path_index_array[global_index] : global_index; - integrator_intersect_closest(nullptr, path_index); + integrator_intersect_closest(nullptr, path_index, __params.render_buffer); } extern "C" __global__ void __raygen__kernel_optix_integrator_intersect_shadow() |