[Bf-blender-cvs] [c2d6c19] cycles_kernel_split: Cycles kernel split: Remove unwanted whitespace changes
Sergey Sharybin
noreply at git.blender.org
Thu May 7 15:54:07 CEST 2015
Commit: c2d6c1999a2e45638ae60f510f56e1c3f225c49e
Author: Sergey Sharybin
Date: Thu May 7 18:52:07 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rBc2d6c1999a2e45638ae60f510f56e1c3f225c49e
Cycles kernel split: Remove unwanted whitespace changes
===================================================================
M intern/cycles/device/device_multi.cpp
M intern/cycles/kernel/kernel_accumulate.h
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/kernel_globals.h
M intern/cycles/kernel/kernel_light.h
M intern/cycles/kernel/kernel_passes.h
M intern/cycles/kernel/kernel_random.h
===================================================================
diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp
index b41ec99..c0a1516 100644
--- a/intern/cycles/device/device_multi.cpp
+++ b/intern/cycles/device/device_multi.cpp
@@ -94,6 +94,7 @@ public:
foreach(SubDevice& sub, devices)
if(!sub.device->load_kernels(requested_features))
return false;
+
return true;
}
diff --git a/intern/cycles/kernel/kernel_accumulate.h b/intern/cycles/kernel/kernel_accumulate.h
index 850ceac..257728b 100644
--- a/intern/cycles/kernel/kernel_accumulate.h
+++ b/intern/cycles/kernel/kernel_accumulate.h
@@ -176,7 +176,6 @@ ccl_device_inline void path_radiance_init(PathRadiance *L, int use_light_pass)
#endif
}
-
ccl_device_inline void path_radiance_bsdf_bounce(PathRadiance *L, ccl_addr_space float3 *throughput,
BsdfEval *bsdf_eval, float bsdf_pdf, int bounce, int bsdf_label)
{
@@ -195,7 +194,7 @@ ccl_device_inline void path_radiance_bsdf_bounce(PathRadiance *L, ccl_addr_space
L->path_scatter = bsdf_eval->scatter*value;
*throughput = L->path_diffuse + L->path_glossy + L->path_transmission + L->path_subsurface + L->path_scatter;
-
+
L->direct_throughput = *throughput;
}
else {
@@ -212,7 +211,6 @@ ccl_device_inline void path_radiance_bsdf_bounce(PathRadiance *L, ccl_addr_space
#endif
}
-
ccl_device_inline void path_radiance_accum_emission(PathRadiance *L, float3 throughput, float3 value, int bounce)
{
#ifdef __PASSES__
@@ -231,7 +229,6 @@ ccl_device_inline void path_radiance_accum_emission(PathRadiance *L, float3 thro
#endif
}
-
ccl_device_inline void path_radiance_accum_ao(PathRadiance *L, float3 throughput, float3 alpha, float3 bsdf, float3 ao, int bounce)
{
#ifdef __PASSES__
@@ -253,7 +250,6 @@ ccl_device_inline void path_radiance_accum_ao(PathRadiance *L, float3 throughput
#endif
}
-
ccl_device_inline void path_radiance_accum_light(PathRadiance *L, float3 throughput, BsdfEval *bsdf_eval, float3 shadow, float shadow_fac, int bounce, bool is_lamp)
{
#ifdef __PASSES__
@@ -285,7 +281,6 @@ ccl_device_inline void path_radiance_accum_light(PathRadiance *L, float3 through
#endif
}
-
ccl_device_inline void path_radiance_accum_background(PathRadiance *L, float3 throughput, float3 value, int bounce)
{
#ifdef __PASSES__
@@ -304,7 +299,6 @@ ccl_device_inline void path_radiance_accum_background(PathRadiance *L, float3 th
#endif
}
-
ccl_device_inline void path_radiance_sum_indirect(PathRadiance *L)
{
#ifdef __PASSES__
@@ -345,7 +339,6 @@ ccl_device_inline void path_radiance_reset_indirect(PathRadiance *L)
#endif
}
-
ccl_device_inline float3 path_radiance_clamp_and_sum(KernelGlobals *kg, PathRadiance *L)
{
float3 L_sum, L_direct, L_indirect;
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 37579f7..c46ff25 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -192,7 +192,7 @@ ccl_device void camera_sample_panorama(KernelGlobals *kg, float raster_x, float
ray->D = panorama_to_direction(kg, Pcamera.x, Pcamera.y);
/* indicates ray should not receive any light, outside of the lens */
- if(is_zero(ray->D)) {
+ if(is_zero(ray->D)) {
ray->t = 0.0f;
return;
}
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h
index 3fadb19..17fa189 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -86,7 +86,6 @@ typedef ccl_addr_space struct KernelGlobals {
#define KERNEL_TEX(type, ttype, name) \
ccl_global type *name;
#include "kernel_textures.h"
-
} KernelGlobals;
#endif
diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index 865d984..704fb49 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -520,7 +520,7 @@ ccl_device float lamp_light_pdf(KernelGlobals *kg, const float3 Ng, const float3
if(cos_pi <= 0.0f)
return 0.0f;
-
+
return t*t/cos_pi;
}
@@ -802,7 +802,7 @@ ccl_device float triangle_light_pdf(KernelGlobals *kg,
if(cos_pi == 0.0f)
return 0.0f;
-
+
return t*t*pdf/cos_pi;
}
diff --git a/intern/cycles/kernel/kernel_passes.h b/intern/cycles/kernel/kernel_passes.h
index d2ae5f7..326141a 100644
--- a/intern/cycles/kernel/kernel_passes.h
+++ b/intern/cycles/kernel/kernel_passes.h
@@ -73,7 +73,7 @@ ccl_device_inline void kernel_write_data_passes(KernelGlobals *kg, ccl_global fl
if(!(flag & PASS_ALL))
return;
-
+
if(!(path_flag & PATH_RAY_SINGLE_PASS_DONE)) {
if(!(sd_fetch(flag) & SD_TRANSPARENT) ||
kernel_data.film.pass_alpha_threshold == 0.0f ||
@@ -156,7 +156,7 @@ ccl_device_inline void kernel_write_light_passes(KernelGlobals *kg, ccl_global f
if(!kernel_data.film.use_light_pass)
return;
-
+
if(flag & PASS_DIFFUSE_INDIRECT)
kernel_write_pass_float3(buffer + kernel_data.film.pass_diffuse_indirect, sample, L->indirect_diffuse);
if(flag & PASS_GLOSSY_INDIRECT)
diff --git a/intern/cycles/kernel/kernel_random.h b/intern/cycles/kernel/kernel_random.h
index 7a08c50..631a2cb 100644
--- a/intern/cycles/kernel/kernel_random.h
+++ b/intern/cycles/kernel/kernel_random.h
@@ -73,7 +73,7 @@ ccl_device uint sobol_dimension(KernelGlobals *kg, int index, int dimension)
for(uint j = 0; i; i >>= 1, j++)
if(i & 1)
result ^= kernel_tex_fetch(__sobol_directions, 32*dimension + j);
-
+
return result;
}
@@ -98,7 +98,6 @@ ccl_device uint sobol_lookup(const uint m, const uint frame, const uint ex, cons
return index;
}
-
ccl_device_inline float path_rng_1D(KernelGlobals *kg, ccl_addr_space RNG *rng, int sample, int num_samples, int dimension)
{
#ifdef __CMJ__
@@ -150,7 +149,6 @@ ccl_device_inline void path_rng_2D(KernelGlobals *kg, ccl_addr_space RNG *rng, i
}
}
-
ccl_device_inline void path_rng_init(KernelGlobals *kg, ccl_global uint *rng_state, int sample, int num_samples, ccl_addr_space RNG *rng, int x, int y, float *fx, float *fy)
{
#ifdef __SOBOL_FULL_SCREEN__
@@ -268,7 +266,6 @@ ccl_device_inline float path_state_rng_1D(KernelGlobals *kg, ccl_addr_space RNG
return path_rng_1D(kg, rng, state->sample, state->num_samples, state->rng_offset + dimension);
}
-
ccl_device_inline float path_state_rng_1D_for_decision(KernelGlobals *kg, ccl_addr_space RNG *rng, const ccl_addr_space PathState *state, int dimension)
{
/* the rng_offset is not increased for transparent bounces. if we do then
@@ -282,7 +279,6 @@ ccl_device_inline float path_state_rng_1D_for_decision(KernelGlobals *kg, ccl_ad
return path_rng_1D(kg, rng, state->sample, state->num_samples, rng_offset + dimension);
}
-
ccl_device_inline void path_state_rng_2D(KernelGlobals *kg, ccl_addr_space RNG *rng, const ccl_addr_space PathState *state, int dimension, float *fx, float *fy)
{
path_rng_2D(kg, rng, state->sample, state->num_samples, state->rng_offset + dimension, fx, fy);
More information about the Bf-blender-cvs
mailing list