Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey@blender.org>2021-11-11 17:29:35 +0300
committerSergey Sharybin <sergey@blender.org>2021-11-11 17:29:35 +0300
commitce395c84a34225a820002ad551bee324b072f034 (patch)
treeb981bdd0a69272abb6c0aaf1e7cb4f2530f7e254 /intern/cycles/kernel/device/gpu
parent06a74e78169ff60082716c0bd85c0b76de6bb885 (diff)
parentd26d3cfe193793728cac77be9b44463a84a0f57e (diff)
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'intern/cycles/kernel/device/gpu')
-rw-r--r--intern/cycles/kernel/device/gpu/kernel.h3
1 files changed, 2 insertions, 1 deletions
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));
}
}