Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix indentation

Browse Source
This commit is contained in:
Mai Lavelle
2017-03-07 05:21:36 -05:00
parent fe7cc94dfa
commit 64751552f7
6 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
intern/cycles/device/device_cpu.cpp
View File

@@ -236,8 +236,8 @@ public:
{ {
if(name) { if(name) {
VLOG(1) << "Buffer allocate: " << name << ", " VLOG(1) << "Buffer allocate: " << name << ", "
<< string_human_readable_number(mem.memory_size()) << " bytes. (" << string_human_readable_number(mem.memory_size()) << " bytes. ("
<< string_human_readable_size(mem.memory_size()) << ")"; << string_human_readable_size(mem.memory_size()) << ")";
} }
mem.device_pointer = mem.data_pointer; mem.device_pointer = mem.data_pointer;
@@ -753,20 +753,20 @@ bool CPUSplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim,
device_memory& work_pool_wgs) device_memory& work_pool_wgs)
{ {
typedef void(*data_init_t)(KernelGlobals *kg, typedef void(*data_init_t)(KernelGlobals *kg,
ccl_constant KernelData *data, ccl_constant KernelData *data,
ccl_global void *split_data_buffer, ccl_global void *split_data_buffer,
int num_elements, int num_elements,
ccl_global char *ray_state, ccl_global char *ray_state,
ccl_global uint *rng_state, ccl_global uint *rng_state,
int start_sample, int start_sample,
int end_sample, int end_sample,
int sx, int sy, int sw, int sh, int offset, int stride, int sx, int sy, int sw, int sh, int offset, int stride,
ccl_global int *Queue_index, ccl_global int *Queue_index,
int queuesize, int queuesize,
ccl_global char *use_queues_flag, ccl_global char *use_queues_flag,
ccl_global unsigned int *work_pool_wgs, ccl_global unsigned int *work_pool_wgs,
unsigned int num_samples, unsigned int num_samples,
ccl_global float *buffer); ccl_global float *buffer);
data_init_t data_init; data_init_t data_init;
@@ -812,25 +812,25 @@ bool CPUSplitKernel::enqueue_split_kernel_data_init(const KernelDimensions& dim,
kg->global_id = make_int2(x, y); kg->global_id = make_int2(x, y);
data_init((KernelGlobals*)kernel_globals.device_pointer, data_init((KernelGlobals*)kernel_globals.device_pointer,
(KernelData*)data.device_pointer, (KernelData*)data.device_pointer,
(void*)split_data.device_pointer, (void*)split_data.device_pointer,
num_global_elements, num_global_elements,
(char*)ray_state.device_pointer, (char*)ray_state.device_pointer,
(uint*)rtile.rng_state, (uint*)rtile.rng_state,
rtile.start_sample, rtile.start_sample,
rtile.start_sample + rtile.num_samples, rtile.start_sample + rtile.num_samples,
rtile.x, rtile.x,
rtile.y, rtile.y,
rtile.w, rtile.w,
rtile.h, rtile.h,
rtile.offset, rtile.offset,
rtile.stride, rtile.stride,
(int*)queue_index.device_pointer, (int*)queue_index.device_pointer,
dim.global_size[0] * dim.global_size[1], dim.global_size[0] * dim.global_size[1],
(char*)use_queues_flags.device_pointer, (char*)use_queues_flags.device_pointer,
(uint*)work_pool_wgs.device_pointer, (uint*)work_pool_wgs.device_pointer,
rtile.num_samples, rtile.num_samples,
(float*)rtile.buffer); (float*)rtile.buffer);
} }
} }

16
intern/cycles/device/device_cuda.cpp
View File

@@ -511,8 +511,8 @@ public:
{ {
if(name) { if(name) {
VLOG(1) << "Buffer allocate: " << name << ", " VLOG(1) << "Buffer allocate: " << name << ", "
<< string_human_readable_number(mem.memory_size()) << " bytes. (" << string_human_readable_number(mem.memory_size()) << " bytes. ("
<< string_human_readable_size(mem.memory_size()) << ")"; << string_human_readable_size(mem.memory_size()) << ")";
} }
cuda_push_context(); cuda_push_context();
@@ -1459,9 +1459,9 @@ public:
cuda_assert(cuFuncSetCacheConfig(func, CU_FUNC_CACHE_PREFER_L1)); cuda_assert(cuFuncSetCacheConfig(func, CU_FUNC_CACHE_PREFER_L1));
cuda_assert(cuLaunchKernel(func, cuda_assert(cuLaunchKernel(func,
xblocks , yblocks, 1, /* blocks */ xblocks , yblocks, 1, /* blocks */
xthreads, ythreads, 1, /* threads */ xthreads, ythreads, 1, /* threads */
0, 0, args, 0)); 0, 0, args, 0));
device->cuda_pop_context(); device->cuda_pop_context();
@@ -1498,9 +1498,9 @@ size_t CUDASplitKernel::state_buffer_size(device_memory& /*kg*/, device_memory&
cuda_assert(cuModuleGetFunction(&state_buffer_size, device->cuModule, "kernel_cuda_state_buffer_size")); cuda_assert(cuModuleGetFunction(&state_buffer_size, device->cuModule, "kernel_cuda_state_buffer_size"));
cuda_assert(cuLaunchKernel(state_buffer_size, cuda_assert(cuLaunchKernel(state_buffer_size,
1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1,
0, 0, &args, 0)); 0, 0, &args, 0));
device->cuda_pop_context(); device->cuda_pop_context();

19
intern/cycles/device/device_split_kernel.cpp
View File

@@ -192,16 +192,15 @@ bool DeviceSplitKernel::path_trace(DeviceTask *task,
device->mem_zero(split_data); device->mem_zero(split_data);
if(!enqueue_split_kernel_data_init(KernelDimensions(global_size, local_size), if(!enqueue_split_kernel_data_init(KernelDimensions(global_size, local_size),
subtile, subtile,
num_global_elements, num_global_elements,
kgbuffer, kgbuffer,
kernel_data, kernel_data,
split_data, split_data,
ray_state, ray_state,
queue_index, queue_index,
use_queues_flag, use_queues_flag,
work_pool_wgs work_pool_wgs))
))
{ {
return false; return false;
} }

30
intern/cycles/device/opencl/opencl_base.cpp
View File

@@ -336,14 +336,14 @@ void OpenCLDeviceBase::mem_zero(device_memory& mem)
kernel_set_args(ckZeroBuffer, 0, d_buffer, d_size, d_offset); kernel_set_args(ckZeroBuffer, 0, d_buffer, d_size, d_offset);
ciErr = clEnqueueNDRangeKernel(cqCommandQueue, ciErr = clEnqueueNDRangeKernel(cqCommandQueue,
ckZeroBuffer, ckZeroBuffer,
2, 2,
NULL, NULL,
global_size, global_size,
NULL, NULL,
0, 0,
NULL, NULL,
NULL); NULL);
opencl_assert_err(ciErr, "clEnqueueNDRangeKernel"); opencl_assert_err(ciErr, "clEnqueueNDRangeKernel");
d_offset += d_size; d_offset += d_size;
@@ -363,13 +363,13 @@ void OpenCLDeviceBase::mem_zero(device_memory& mem)
} }
opencl_assert(clEnqueueWriteBuffer(cqCommandQueue, opencl_assert(clEnqueueWriteBuffer(cqCommandQueue,
CL_MEM_PTR(mem.device_pointer), CL_MEM_PTR(mem.device_pointer),
CL_TRUE, CL_TRUE,
0, 0,
mem.memory_size(), mem.memory_size(),
zero, zero,
0, 0,
NULL, NULL)); NULL, NULL));
if(!mem.data_pointer) { if(!mem.data_pointer) {
util_aligned_free(zero); util_aligned_free(zero);

12
intern/cycles/device/opencl/opencl_split.cpp
View File

@@ -128,9 +128,9 @@ public:
/* Keep rendering tiles until done. */ /* Keep rendering tiles until done. */
while(task->acquire_tile(this, tile)) { while(task->acquire_tile(this, tile)) {
split_kernel->path_trace(task, split_kernel->path_trace(task,
tile, tile,
kgbuffer, kgbuffer,
*const_mem_map["__data"]); *const_mem_map["__data"]);
/* Complete kernel execution before release tile. */ /* Complete kernel execution before release tile. */
/* This helps in multi-device render; /* This helps in multi-device render;
@@ -284,9 +284,9 @@ public:
0, 0,
kernel_globals, kernel_globals,
kernel_data, kernel_data,
split_data, split_data,
num_global_elements, num_global_elements,
ray_state, ray_state,
rtile.rng_state); rtile.rng_state);
/* TODO(sergey): Avoid map lookup here. */ /* TODO(sergey): Avoid map lookup here. */
@@ -311,7 +311,7 @@ public:
use_queues_flag, use_queues_flag,
work_pool_wgs, work_pool_wgs,
rtile.num_samples, rtile.num_samples,
rtile.buffer); rtile.buffer);
/* Enqueue ckPathTraceKernel_data_init kernel. */ /* Enqueue ckPathTraceKernel_data_init kernel. */
device->ciErr = clEnqueueNDRangeKernel(device->cqCommandQueue, device->ciErr = clEnqueueNDRangeKernel(device->cqCommandQueue,

6
intern/cycles/kernel/split/kernel_path_init.h
View File

@@ -50,9 +50,9 @@ ccl_device void kernel_path_init(KernelGlobals *kg) {
/* Get pixel and tile position associated with the work. */ /* Get pixel and tile position associated with the work. */
get_work_pixel_tile_position(kg, &pixel_x, &pixel_y, get_work_pixel_tile_position(kg, &pixel_x, &pixel_y,
&tile_x, &tile_y, &tile_x, &tile_y,
work_index, work_index,
ray_index); ray_index);
kernel_split_state.work_array[ray_index] = work_index; kernel_split_state.work_array[ray_index] = work_index;
ccl_global uint *rng_state = kernel_split_params.rng_state; ccl_global uint *rng_state = kernel_split_params.rng_state;