diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-11-30 01:18:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-11-30 02:15:17 +0300 |
| commit | ac447ba1a3f2479f65c9ceddebaafc47681623ba (patch) | |
| tree | b134c5750696a977700f990477d9e3478750ae0a /intern/cycles | |
| parent | e2473d3baf00eb9984ce679c716489d891019279 (diff) | |
Cleanup: clang-format, trailing space
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/device/cuda/queue.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/device/hip/queue.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/device/metal/context_begin.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/tables.h | 2 | ||||
| -rw-r--r-- | intern/cycles/test/integrator_tile_test.cpp | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/device/cuda/queue.cpp b/intern/cycles/device/cuda/queue.cpp index 880d7ca4cf2..ca57882adbf 100644 --- a/intern/cycles/device/cuda/queue.cpp +++ b/intern/cycles/device/cuda/queue.cpp @@ -135,7 +135,7 @@ bool CUDADeviceQueue::enqueue(DeviceKernel kernel, 1, shared_mem_bytes, cuda_stream_, - const_cast<void**>(args.values), + const_cast<void **>(args.values), 0), "enqueue"); diff --git a/intern/cycles/device/hip/queue.cpp b/intern/cycles/device/hip/queue.cpp index 42841324ed6..81b283e8cf5 100644 --- a/intern/cycles/device/hip/queue.cpp +++ b/intern/cycles/device/hip/queue.cpp @@ -134,7 +134,7 @@ bool HIPDeviceQueue::enqueue(DeviceKernel kernel, 1, shared_mem_bytes, hip_stream_, - const_cast<void**>(args.values), + const_cast<void **>(args.values), 0), "enqueue"); diff --git a/intern/cycles/kernel/device/metal/context_begin.h b/intern/cycles/kernel/device/metal/context_begin.h index 2e91e93f088..2eefd795aa1 100644 --- a/intern/cycles/kernel/device/metal/context_begin.h +++ b/intern/cycles/kernel/device/metal/context_begin.h @@ -26,7 +26,7 @@ class MetalKernelContext { MetalKernelContext(constant KernelParamsMetal &_launch_params_metal, constant MetalAncillaries * _metal_ancillaries) : launch_params_metal(_launch_params_metal), metal_ancillaries(_metal_ancillaries) {} - + MetalKernelContext(constant KernelParamsMetal &_launch_params_metal) : launch_params_metal(_launch_params_metal) {} diff --git a/intern/cycles/kernel/tables.h b/intern/cycles/kernel/tables.h index 768033d4ffe..544bf7b7add 100644 --- a/intern/cycles/kernel/tables.h +++ b/intern/cycles/kernel/tables.h @@ -73,4 +73,4 @@ ccl_inline_constant float cie_colour_match[][3] = { {0.0001f, 0.0000f, 0.0000f}, {0.0001f, 0.0000f, 0.0000f}, {0.0000f, 0.0000f, 0.0000f} }; -/* clang-format on */
\ No newline at end of file +/* clang-format on */ diff --git a/intern/cycles/test/integrator_tile_test.cpp b/intern/cycles/test/integrator_tile_test.cpp index 822c34c36bf..1d078a2d19a 100644 --- a/intern/cycles/test/integrator_tile_test.cpp +++ b/intern/cycles/test/integrator_tile_test.cpp @@ -25,7 +25,8 @@ TEST(tile_calculate_best_size, Basic) { /* Make sure CPU-like case is handled properly. */ EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 1, 1, 1.0f), TileSize(1, 1, 1)); - EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 100, 1, 1.0f), TileSize(1, 1, 1)); + EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 100, 1, 1.0f), + TileSize(1, 1, 1)); /* Enough path states to fit an entire image with all samples. */ EXPECT_EQ(tile_calculate_best_size(false, make_int2(1920, 1080), 1, 1920 * 1080, 1.0f), |