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:
authorMai Lavelle <mai.lavelle@gmail.com>2017-03-07 13:21:36 +0300
committerMai Lavelle <mai.lavelle@gmail.com>2017-03-08 09:31:32 +0300
commit64751552f7037777e9d28c292ee30926f6d8a1e8 (patch)
treee3d2112d90042de953273a03d8d719c56f600995 /intern/cycles/device/opencl
parentfe7cc94dfaa466b25aa800abc6a03c715e97cef4 (diff)
Cycles: Fix indentation
Diffstat (limited to 'intern/cycles/device/opencl')
-rw-r--r--intern/cycles/device/opencl/opencl_base.cpp30
-rw-r--r--intern/cycles/device/opencl/opencl_split.cpp12
2 files changed, 21 insertions, 21 deletions
diff --git a/intern/cycles/device/opencl/opencl_base.cpp b/intern/cycles/device/opencl/opencl_base.cpp
index cb8b0783570..d05259468bb 100644
--- a/intern/cycles/device/opencl/opencl_base.cpp
+++ b/intern/cycles/device/opencl/opencl_base.cpp
@@ -336,14 +336,14 @@ void OpenCLDeviceBase::mem_zero(device_memory& mem)
kernel_set_args(ckZeroBuffer, 0, d_buffer, d_size, d_offset);
ciErr = clEnqueueNDRangeKernel(cqCommandQueue,
- ckZeroBuffer,
- 2,
- NULL,
- global_size,
- NULL,
- 0,
- NULL,
- NULL);
+ ckZeroBuffer,
+ 2,
+ NULL,
+ global_size,
+ NULL,
+ 0,
+ NULL,
+ NULL);
opencl_assert_err(ciErr, "clEnqueueNDRangeKernel");
d_offset += d_size;
@@ -363,13 +363,13 @@ void OpenCLDeviceBase::mem_zero(device_memory& mem)
}
opencl_assert(clEnqueueWriteBuffer(cqCommandQueue,
- CL_MEM_PTR(mem.device_pointer),
- CL_TRUE,
- 0,
- mem.memory_size(),
- zero,
- 0,
- NULL, NULL));
+ CL_MEM_PTR(mem.device_pointer),
+ CL_TRUE,
+ 0,
+ mem.memory_size(),
+ zero,
+ 0,
+ NULL, NULL));
if(!mem.data_pointer) {
util_aligned_free(zero);
diff --git a/intern/cycles/device/opencl/opencl_split.cpp b/intern/cycles/device/opencl/opencl_split.cpp
index a44f5da3a32..be931599e39 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -128,9 +128,9 @@ public:
/* Keep rendering tiles until done. */
while(task->acquire_tile(this, tile)) {
split_kernel->path_trace(task,
- tile,
- kgbuffer,
- *const_mem_map["__data"]);
+ tile,
+ kgbuffer,
+ *const_mem_map["__data"]);
/* Complete kernel execution before release tile. */
/* This helps in multi-device render;
@@ -284,9 +284,9 @@ public:
0,
kernel_globals,
kernel_data,
- split_data,
+ split_data,
num_global_elements,
- ray_state,
+ ray_state,
rtile.rng_state);
/* TODO(sergey): Avoid map lookup here. */
@@ -311,7 +311,7 @@ public:
use_queues_flag,
work_pool_wgs,
rtile.num_samples,
- rtile.buffer);
+ rtile.buffer);
/* Enqueue ckPathTraceKernel_data_init kernel. */
device->ciErr = clEnqueueNDRangeKernel(device->cqCommandQueue,