[Bf-blender-cvs] [ce395c84a34] master: Merge branch 'blender-v3.0-release'

[Sergey Sharybin]

Commit: ce395c84a34225a820002ad551bee324b072f034
Author: Sergey Sharybin
Date:   Thu Nov 11 15:29:35 2021 +0100
Branches: master
https://developer.blender.org/rBce395c84a34225a820002ad551bee324b072f034

Merge branch 'blender-v3.0-release'

===================================================================



===================================================================

diff --cc intern/cycles/kernel/device/gpu/kernel.h
index d63cd0e8262,56fcc38b907..dd0c6dd6893
--- a/intern/cycles/kernel/device/gpu/kernel.h
+++ b/intern/cycles/kernel/device/gpu/kernel.h
@@@ -129,15 -116,15 +129,16 @@@ ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THR
  }
  
  ccl_gpu_kernel(GPU_KERNEL_BLOCK_NUM_THREADS, GPU_KERNEL_MAX_REGISTERS)
 -    kernel_gpu_integrator_intersect_closest(const int *path_index_array,
 -                                            ccl_global float *render_buffer,
 -                                            const int work_size)
 +    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));
 -    integrator_intersect_closest(NULL, state, render_buffer);
++    ccl_gpu_kernel_call(integrator_intersect_closest(NULL, state, render_buffer));
    }
  }