diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-02-15 03:05:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-02-15 03:05:47 +0300 |
| commit | a9a05d559798d9378f57d923dd18c9e63d7145ef (patch) | |
| tree | f4b7410002e8b993d34ef820f17270a2454a847c /intern/cycles/kernel/device/gpu/kernel.h | |
| parent | 3d1e97825712bdaadf4038ba99fa7a0a87f7294c (diff) | |
| parent | facd9d82682b30e14e3a7db8fe6af830428d65cc (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'intern/cycles/kernel/device/gpu/kernel.h')
| -rw-r--r-- | intern/cycles/kernel/device/gpu/kernel.h | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/intern/cycles/kernel/device/gpu/kernel.h b/intern/cycles/kernel/device/gpu/kernel.h index 5dacf2910be..26ab99766ad 100644 --- a/intern/cycles/kernel/device/gpu/kernel.h +++ b/intern/cycles/kernel/device/gpu/kernel.h @@ -283,7 +283,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda_pass.kernel_index = kernel_index; gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) @@ -298,7 +301,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda_pass.kernel_index = kernel_index; gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) @@ -310,7 +316,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda(INTEGRATOR_STATE(state, path, queued_kernel) != 0); gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) @@ -323,7 +332,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda(INTEGRATOR_STATE(state, path, queued_kernel) == 0); gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices + indices_offset, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices + indices_offset, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) @@ -336,7 +348,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda(INTEGRATOR_STATE(state, shadow_path, queued_kernel) == 0); gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices + indices_offset, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices + indices_offset, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE) @@ -379,7 +394,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda_pass.num_active_paths = num_active_paths; gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE) @@ -412,7 +430,10 @@ ccl_gpu_kernel_threads(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE) ccl_gpu_kernel_lambda_pass.num_active_paths = num_active_paths; gpu_parallel_active_index_array(GPU_PARALLEL_ACTIVE_INDEX_DEFAULT_BLOCK_SIZE, - num_states, indices, num_indices, ccl_gpu_kernel_lambda_pass); + num_states, + indices, + num_indices, + ccl_gpu_kernel_lambda_pass); } ccl_gpu_kernel_threads(GPU_PARALLEL_SORTED_INDEX_DEFAULT_BLOCK_SIZE) |