forked from bartvdbraak/blender
Cycles: Cleanup, space after keyword
This commit is contained in:
parent
771e6120c8
commit
580741b317
@ -635,7 +635,7 @@ bool OpenCLInfo::device_supported(const string& platform_name,
|
||||
"Tahiti", "Pitcairn", "Capeverde", "Oland",
|
||||
NULL
|
||||
};
|
||||
for (int i = 0; blacklist[i] != NULL; i++) {
|
||||
for(int i = 0; blacklist[i] != NULL; i++) {
|
||||
if(device_name == blacklist[i]) {
|
||||
VLOG(1) << "AMD device " << device_name << " not supported";
|
||||
return false;
|
||||
|
@ -96,7 +96,7 @@ ccl_device void kernel_filter_get_feature(int sample,
|
||||
int idx = (y-rect.y)*buffer_w + (x - rect.x);
|
||||
|
||||
mean[idx] = center_buffer[m_offset] / sample;
|
||||
if (sample > 1) {
|
||||
if(sample > 1) {
|
||||
if(use_split_variance) {
|
||||
variance[idx] = max(0.0f, (center_buffer[v_offset] - mean[idx]*mean[idx]*sample) / (sample * (sample-1)));
|
||||
}
|
||||
|
@ -173,7 +173,7 @@ ccl_device_inline float path_state_terminate_probability(KernelGlobals *kg, ccl_
|
||||
}
|
||||
#ifdef __SHADOW_TRICKS__
|
||||
/* Exception for shadow catcher not working correctly with RR. */
|
||||
else if ((state->flag & PATH_RAY_SHADOW_CATCHER) && (state->transparent_bounce <= 8)) {
|
||||
else if((state->flag & PATH_RAY_SHADOW_CATCHER) && (state->transparent_bounce <= 8)) {
|
||||
return 1.0f;
|
||||
}
|
||||
#endif
|
||||
@ -196,7 +196,7 @@ ccl_device_inline float path_state_terminate_probability(KernelGlobals *kg, ccl_
|
||||
}
|
||||
#ifdef __SHADOW_TRICKS__
|
||||
/* Exception for shadow catcher not working correctly with RR. */
|
||||
else if ((state->flag & PATH_RAY_SHADOW_CATCHER) && (state->bounce <= 3)) {
|
||||
else if((state->flag & PATH_RAY_SHADOW_CATCHER) && (state->bounce <= 3)) {
|
||||
return 1.0f;
|
||||
}
|
||||
#endif
|
||||
|
@ -39,7 +39,7 @@ ccl_device void kernel_shader_sort(KernelGlobals *kg,
|
||||
ccl_local ushort *local_index = &locals->local_index[0];
|
||||
|
||||
/* copy to local memory */
|
||||
for (uint i = 0; i < SHADER_SORT_BLOCK_SIZE; i += SHADER_SORT_LOCAL_SIZE) {
|
||||
for(uint i = 0; i < SHADER_SORT_BLOCK_SIZE; i += SHADER_SORT_LOCAL_SIZE) {
|
||||
uint idx = offset + i + lid;
|
||||
uint add = input + idx;
|
||||
uint value = (~0);
|
||||
@ -59,9 +59,9 @@ ccl_device void kernel_shader_sort(KernelGlobals *kg,
|
||||
# ifdef __KERNEL_OPENCL__
|
||||
|
||||
/* bitonic sort */
|
||||
for (uint length = 1; length < SHADER_SORT_BLOCK_SIZE; length <<= 1) {
|
||||
for (uint inc = length; inc > 0; inc >>= 1) {
|
||||
for (uint ii = 0; ii < SHADER_SORT_BLOCK_SIZE; ii += SHADER_SORT_LOCAL_SIZE) {
|
||||
for(uint length = 1; length < SHADER_SORT_BLOCK_SIZE; length <<= 1) {
|
||||
for(uint inc = length; inc > 0; inc >>= 1) {
|
||||
for(uint ii = 0; ii < SHADER_SORT_BLOCK_SIZE; ii += SHADER_SORT_LOCAL_SIZE) {
|
||||
uint i = lid + ii;
|
||||
bool direction = ((i & (length << 1)) != 0);
|
||||
uint j = i ^ inc;
|
||||
@ -81,7 +81,7 @@ ccl_device void kernel_shader_sort(KernelGlobals *kg,
|
||||
# endif /* __KERNEL_OPENCL__ */
|
||||
|
||||
/* copy to destination */
|
||||
for (uint i = 0; i < SHADER_SORT_BLOCK_SIZE; i += SHADER_SORT_LOCAL_SIZE) {
|
||||
for(uint i = 0; i < SHADER_SORT_BLOCK_SIZE; i += SHADER_SORT_LOCAL_SIZE) {
|
||||
uint idx = offset + i + lid;
|
||||
uint lidx = local_index[i + lid];
|
||||
uint outi = output + idx;
|
||||
|
@ -344,7 +344,7 @@ int ImageManager::add_image(const string& filename,
|
||||
else {
|
||||
/* Very unlikely, since max_num_images is insanely big. But better safe than sorry. */
|
||||
int tex_count = 0;
|
||||
for (int type = 0; type < IMAGE_DATA_NUM_TYPES; type++) {
|
||||
for(int type = 0; type < IMAGE_DATA_NUM_TYPES; type++) {
|
||||
tex_count += tex_num_images[type];
|
||||
}
|
||||
if(tex_count > max_num_images) {
|
||||
|
@ -225,7 +225,7 @@ void LightManager::disable_ineffective_light(Device *device, Scene *scene)
|
||||
bool LightManager::object_usable_as_light(Object *object) {
|
||||
Mesh *mesh = object->mesh;
|
||||
/* Skip objects with NaNs */
|
||||
if (!object->bounds.valid()) {
|
||||
if(!object->bounds.valid()) {
|
||||
return false;
|
||||
}
|
||||
/* Skip if we are not visible for BSDFs. */
|
||||
|
@ -223,20 +223,20 @@ ccl_device void math_matrix_jacobi_eigendecomposition(float *A, ccl_global float
|
||||
{
|
||||
const float singular_epsilon = 1e-9f;
|
||||
|
||||
for (int row = 0; row < n; row++) {
|
||||
for (int col = 0; col < n; col++) {
|
||||
for(int row = 0; row < n; row++) {
|
||||
for(int col = 0; col < n; col++) {
|
||||
MATS(V, n, row, col, v_stride) = (col == row) ? 1.0f : 0.0f;
|
||||
}
|
||||
}
|
||||
|
||||
for (int sweep = 0; sweep < 8; sweep++) {
|
||||
for(int sweep = 0; sweep < 8; sweep++) {
|
||||
float off_diagonal = 0.0f;
|
||||
for (int row = 1; row < n; row++) {
|
||||
for (int col = 0; col < row; col++) {
|
||||
for(int row = 1; row < n; row++) {
|
||||
for(int col = 0; col < row; col++) {
|
||||
off_diagonal += fabsf(MAT(A, n, row, col));
|
||||
}
|
||||
}
|
||||
if (off_diagonal < 1e-7f) {
|
||||
if(off_diagonal < 1e-7f) {
|
||||
/* The matrix has nearly reached diagonal form.
|
||||
* Since the eigenvalues are only used to determine truncation, their exact values aren't required - a relative error of a few ULPs won't matter at all. */
|
||||
break;
|
||||
@ -253,7 +253,7 @@ ccl_device void math_matrix_jacobi_eigendecomposition(float *A, ccl_global float
|
||||
float abs_element = fabsf(element);
|
||||
|
||||
/* If we're in a later sweep and the element already is very small, just set it to zero and skip the rotation. */
|
||||
if (sweep > 3 && abs_element <= singular_epsilon*fabsf(MAT(A, n, row, row)) && abs_element <= singular_epsilon*fabsf(MAT(A, n, col, col))) {
|
||||
if(sweep > 3 && abs_element <= singular_epsilon*fabsf(MAT(A, n, row, row)) && abs_element <= singular_epsilon*fabsf(MAT(A, n, col, col))) {
|
||||
MAT(A, n, row, col) = 0.0f;
|
||||
continue;
|
||||
}
|
||||
@ -272,10 +272,10 @@ ccl_device void math_matrix_jacobi_eigendecomposition(float *A, ccl_global float
|
||||
* Then, we compute sin(phi) and cos(phi) themselves. */
|
||||
float singular_diff = MAT(A, n, row, row) - MAT(A, n, col, col);
|
||||
float ratio;
|
||||
if (abs_element > singular_epsilon*fabsf(singular_diff)) {
|
||||
if(abs_element > singular_epsilon*fabsf(singular_diff)) {
|
||||
float cot_2phi = 0.5f*singular_diff / element;
|
||||
ratio = 1.0f / (fabsf(cot_2phi) + sqrtf(1.0f + cot_2phi*cot_2phi));
|
||||
if (cot_2phi < 0.0f) ratio = -ratio; /* Copy sign. */
|
||||
if(cot_2phi < 0.0f) ratio = -ratio; /* Copy sign. */
|
||||
}
|
||||
else {
|
||||
ratio = element / singular_diff;
|
||||
@ -315,21 +315,21 @@ ccl_device void math_matrix_jacobi_eigendecomposition(float *A, ccl_global float
|
||||
}
|
||||
|
||||
/* Sort eigenvalues and the associated eigenvectors. */
|
||||
for (int i = 0; i < n - 1; i++) {
|
||||
for(int i = 0; i < n - 1; i++) {
|
||||
float v = MAT(A, n, i, i);
|
||||
int k = i;
|
||||
for (int j = i; j < n; j++) {
|
||||
if (MAT(A, n, j, j) >= v) {
|
||||
for(int j = i; j < n; j++) {
|
||||
if(MAT(A, n, j, j) >= v) {
|
||||
v = MAT(A, n, j, j);
|
||||
k = j;
|
||||
}
|
||||
}
|
||||
if (k != i) {
|
||||
if(k != i) {
|
||||
/* Swap eigenvalues. */
|
||||
MAT(A, n, k, k) = MAT(A, n, i, i);
|
||||
MAT(A, n, i, i) = v;
|
||||
/* Swap eigenvectors. */
|
||||
for (int j = 0; j < n; j++) {
|
||||
for(int j = 0; j < n; j++) {
|
||||
float v = MATS(V, n, i, j, v_stride);
|
||||
MATS(V, n, i, j, v_stride) = MATS(V, n, k, j, v_stride);
|
||||
MATS(V, n, k, j, v_stride) = v;
|
||||
|
Loading…
Reference in New Issue
Block a user