Commit: 6e9dca221403ed841c16674ad725e046053b1c8d Author: Jeroen Bakker Date: Thu Feb 21 08:52:04 2019 +0100 Branches: blender2.7 https://developer.blender.org/rB6e9dca221403ed841c16674ad725e046053b1c8d
Codestyle: Indentation
===================================================================
M intern/cycles/device/opencl/opencl_split.cpp
===================================================================
diff --git a/intern/cycles/device/opencl/opencl_split.cpp
b/intern/cycles/device/opencl/opencl_split.cpp
index c8f4c2a94c5..8c8c93b75a2 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -154,21 +154,21 @@ public:
if(cached_id != cached_memory.id) {
cl_uint start_arg_index =
device->kernel_set_args(program(),
- 0,
- kg,
- data,
- *cached_memory.split_data,
- *cached_memory.ray_state);
+ 0,
+ kg,
+ data,
+
*cached_memory.split_data,
+
*cached_memory.ray_state);
device->set_kernel_arg_buffers(program(),
&start_arg_index);
start_arg_index +=
device->kernel_set_args(program(),
- start_arg_index,
- *cached_memory.queue_index,
-
*cached_memory.use_queues_flag,
- *cached_memory.work_pools,
- *cached_memory.buffer);
+ start_arg_index,
+
*cached_memory.queue_index,
+
*cached_memory.use_queues_flag,
+
*cached_memory.work_pools,
+ *cached_memory.buffer);
cached_id = cached_memory.id;
}
@@ -211,9 +211,9 @@ public:
bool single_program = OpenCLInfo::use_single_program();
kernel->program =
OpenCLDevice::OpenCLProgram(device,
-
device->get_opencl_program_name(single_program, kernel_name),
-
device->get_opencl_program_filename(single_program, kernel_name),
-
device->get_build_options(requested_features));
+
device->get_opencl_program_name(single_program, kernel_name),
+
device->get_opencl_program_filename(single_program, kernel_name),
+
device->get_build_options(requested_features));
kernel->program.add_kernel(ustring("path_trace_" +
kernel_name));
kernel->program.load();
@@ -237,14 +237,14 @@ public:
size_t global_size = 64;
device->ciErr = clEnqueueNDRangeKernel(device->cqCommandQueue,
-
device->program_state_buffer_size(),
- 1,
- NULL,
- &global_size,
- NULL,
- 0,
- NULL,
- NULL);
+
device->program_state_buffer_size(),
+ 1,
+ NULL,
+ &global_size,
+ NULL,
+ 0,
+ NULL,
+ NULL);
device->opencl_assert_err(device->ciErr,
"clEnqueueNDRangeKernel");
@@ -284,43 +284,43 @@ public:
cl_uint start_arg_index =
device->kernel_set_args(device->program_data_init(),
- 0,
- kernel_globals,
- kernel_data,
- split_data,
- num_global_elements,
- ray_state);
+ 0,
+ kernel_globals,
+ kernel_data,
+ split_data,
+ num_global_elements,
+ ray_state);
device->set_kernel_arg_buffers(device->program_data_init(), &start_arg_index);
start_arg_index +=
device->kernel_set_args(device->program_data_init(),
- start_arg_index,
- start_sample,
- end_sample,
- rtile.x,
- rtile.y,
- rtile.w,
- rtile.h,
- rtile.offset,
- rtile.stride,
- queue_index,
- dQueue_size,
- use_queues_flag,
- work_pool_wgs,
- rtile.num_samples,
- rtile.buffer);
+ start_arg_index,
+ start_sample,
+ end_sample,
+ rtile.x,
+ rtile.y,
+ rtile.w,
+ rtile.h,
+ rtile.offset,
+ rtile.stride,
+ queue_index,
+ dQueue_size,
+ use_queues_flag,
+ work_pool_wgs,
+ rtile.num_samples,
+ rtile.buffer);
/* Enqueue ckPathTraceKernel_data_init kernel. */
device->ciErr = clEnqueueNDRangeKernel(device->cqCommandQueue,
- device->program_data_init(),
- 2,
- NULL,
- dim.global_size,
- dim.local_size,
- 0,
- NULL,
- NULL);
+
device->program_data_init(),
+ 2,
+ NULL,
+ dim.global_size,
+ dim.local_size,
+ 0,
+ NULL,
+ NULL);
device->opencl_assert_err(device->ciErr,
"clEnqueueNDRangeKernel");
@@ -630,18 +630,17 @@ bool OpenCLDevice::load_kernels(const
DeviceRequestedFeatures& requested_feature
#define ADD_SPLIT_KERNEL_SPLIT_PROGRAM(kernel_name) \
program_##kernel_name = \
OpenCLDevice::OpenCLProgram(this, \
-
"split_"#kernel_name, \
-
"kernel_"#kernel_name".cl", \
-
get_build_options(requested_features)); \
+ "split_"#kernel_name, \
+ "kernel_"#kernel_name".cl",
\
+
get_build_options(requested_features)); \
program_##kernel_name.add_kernel(ustring("path_trace_"#kernel_name)); \
programs.push_back(&program_##kernel_name);
if (single_program) {
- program_split = OpenCLDevice::OpenCLProgram(
- this,
- "split" ,
- "kernel_split.cl",
- get_build_options(requested_features));
+ program_split = OpenCLDevice::OpenCLProgram(this,
+ "split" ,
+ "kernel_split.cl",
+
get_build_options(requested_features));
ADD_SPLIT_KERNEL_SINGLE_PROGRAM(path_init);
ADD_SPLIT_KERNEL_SINGLE_PROGRAM(scene_intersect);
@@ -678,11 +677,10 @@ bool OpenCLDevice::load_kernels(const
DeviceRequestedFeatures& requested_feature
/* Quick kernels bundled in a single program to reduce overhead
of starting
* Blender processes. */
- program_split = OpenCLDevice::OpenCLProgram(
- this,
- "split_bundle" ,
- "kernel_split_bundle.cl",
- get_build_options(requested_features));
+ program_split = OpenCLDevice::OpenCLProgram(this,
+ "split_bundle" ,
+
"kernel_split_bundle.cl",
+
get_build_options(requested_features));
ADD_SPLIT_KERNEL_SINGLE_PROGRAM(path_init);
ADD_SPLIT_KERNEL_SINGLE_PROGRAM(scene_intersect);
@@ -725,8 +723,8 @@ void OpenCLDevice::mem_alloc(device_memory& mem)
{
if(mem.name) {
VLOG(1) << "Buffer allocate: " << mem.name << ", "
- << string_human_readable_number(mem.memory_size())
<< " bytes. ("
- << string_human_readable_size(mem.memory_size()) <<
")";
+ << string_human_readable_number(mem.memory_size()) << "
bytes. ("
+ << string_human_readable_size(mem.memory_size()) << ")";
}
size_t size = mem.memory_size();
@@ -1094,7 +1092,7 @@ void OpenCLDevice::flush_texture_buffers()
int pos = name.rfind("_");
int id = atoi(name.data() + pos + 1);
texture_slots.push_back(texture_slot_t(name,
-
num_data_slots + id));
+ num_data_slots +
id));
num_slots = max(num_slots, num_data_slots + id + 1);
}
}
@@ -1155,9 +1153,9 @@ void OpenCLDevice::thread_run(DeviceTask *task)
scoped_timer timer(&tile.buffers->render_time);
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;
@@ -1223,10 +1221,10 @@ void OpenCLDevice::film_convert(DeviceTask& task,
device_ptr buffer, device_ptr
}
bool OpenCLDevice::denoising_non_local_means(device_ptr image_ptr,
- device_ptr guide_ptr,
- device_ptr variance_ptr,
- device_ptr out_ptr,
- DenoisingTask *task)
+ device_ptr guide_ptr,
+ device_ptr variance_ptr,
+ device_ptr out_ptr,
+ DenoisingTask *task)
{
int stride = task->buffer.stride;
int w = task->buffer.width;
@@ -1348,10 +1346,10 @@ bool
OpenCLDevice::denoising_construct_transform(DenoisingTask *task)
}
bool OpenCLDevice::denoising_accumulate(device
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
