Commit: 543c2eb6559c40f1098c8671901441d531db1c2f
Author: Sergey Sharybin
Date: Fri May 8 14:07:23 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB543c2eb6559c40f1098c8671901441d531db1c2f
Cycles kernel split: Remove unwanted whitespace changes
===================================================================
M intern/cycles/kernel/geom/geom_primitive.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/kernel/kernel_emission.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/svm/svm_attribute.h
M intern/cycles/kernel/svm/svm_brick.h
M intern/cycles/kernel/svm/svm_checker.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/kernel/svm/svm_fresnel.h
M intern/cycles/kernel/svm/svm_geometry.h
M intern/cycles/kernel/svm/svm_image.h
M intern/cycles/kernel/svm/svm_sepcomb_hsv.h
M intern/cycles/kernel/svm/svm_sky.h
M intern/cycles/kernel/svm/svm_tex_coord.h
M intern/cycles/kernel/svm/svm_types.h
M intern/cycles/kernel/svm/svm_vector_transform.h
M intern/cycles/kernel/svm/svm_wavelength.h
M intern/cycles/kernel/svm/svm_wireframe.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_primitive.h
b/intern/cycles/kernel/geom/geom_primitive.h
index 365d133..6731f38 100644
--- a/intern/cycles/kernel/geom/geom_primitive.h
+++ b/intern/cycles/kernel/geom/geom_primitive.h
@@ -153,7 +153,8 @@ ccl_device float4 primitive_motion_vector(KernelGlobals
*kg, ShaderData *sd)
}
else
#endif
- center = sd_fetch(P);
+ center = sd_fetch(P);
+
float3 motion_pre = center, motion_post = center;
/* deformation motion */
@@ -177,12 +178,12 @@ ccl_device float4 primitive_motion_vector(KernelGlobals
*kg, ShaderData *sd)
object_position_transform(kg, sd, &motion_post);
}
#endif
- }
+ }
/* object motion. note that depending on the mesh having motion
vectors, this
* transformation was set match the world/object space of
motion_pre/post */
Transform tfm;
-
+
tfm = object_fetch_vector_transform(kg, sd_fetch(object),
OBJECT_VECTOR_MOTION_PRE);
motion_pre = transform_point(&tfm, motion_pre);
diff --git a/intern/cycles/kernel/geom/geom_triangle.h
b/intern/cycles/kernel/geom/geom_triangle.h
index 1914ee1..4cf69f1 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@ -32,7 +32,7 @@ ccl_device_inline float3 triangle_normal(KernelGlobals *kg,
ShaderData *sd)
float3 v0 = float4_to_float3(kernel_tex_fetch(__tri_verts,
__float_as_int(tri_vindex.x)));
float3 v1 = float4_to_float3(kernel_tex_fetch(__tri_verts,
__float_as_int(tri_vindex.y)));
float3 v2 = float4_to_float3(kernel_tex_fetch(__tri_verts,
__float_as_int(tri_vindex.z)));
-
+
/* return normal */
if(sd_fetch(flag) & SD_NEGATIVE_SCALE_APPLIED)
return normalize(cross(v2 - v0, v1 - v0));
diff --git a/intern/cycles/kernel/kernel_emission.h
b/intern/cycles/kernel/kernel_emission.h
index 20850a6..0cea1a2 100644
--- a/intern/cycles/kernel/kernel_emission.h
+++ b/intern/cycles/kernel/kernel_emission.h
@@ -57,7 +57,7 @@ ccl_device_noinline float3 direct_emissive_eval(KernelGlobals
*kg,
ls->Ng = sd_fetch(Ng);
/* no path flag, we're evaluating this for all closures. that's
weak but
- * we'd have to do multiple evaluations otherwise */
+ * we'd have to do multiple evaluations otherwise */
shader_eval_surface(kg, sd, 0.0f, 0, SHADER_CONTEXT_EMISSION);
/* evaluate emissive closure */
@@ -66,7 +66,7 @@ ccl_device_noinline float3 direct_emissive_eval(KernelGlobals
*kg,
else
eval = make_float3(0.0f, 0.0f, 0.0f);
}
-
+
eval *= ls->eval_fac;
return eval;
@@ -113,7 +113,7 @@ ccl_device_noinline bool direct_emission(KernelGlobals *kg,
ShaderData *sd,
float mis_weight = power_heuristic(ls->pdf, bsdf_pdf);
light_eval *= mis_weight;
}
-
+
bsdf_eval_mul(eval, light_eval/ls->pdf);
#ifdef __PASSES__
@@ -188,6 +188,7 @@ ccl_device_noinline float3
indirect_primitive_emission(KernelGlobals *kg, Shader
}
/* Indirect Lamp Emission */
+
/* The argument sd is meaningful only for split kernel. Other uses can just
pass NULL */
ccl_device_noinline bool indirect_lamp_emission(KernelGlobals *kg, PathState
*state, Ray *ray, float3 *emission, ShaderData *sd)
{
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index d0933ab..db4955b 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -93,7 +93,7 @@ ccl_device void shader_setup_from_ray(KernelGlobals *kg,
ShaderData *sd,
sd_fetch(P) = triangle_refine(kg, sd, isect, ray);
sd_fetch(Ng) = Ng;
sd_fetch(N) = Ng;
-
+
/* smooth normal */
if(sd_fetch(shader) & SHADER_SMOOTH_NORMAL)
sd_fetch(N) = triangle_smooth_normal(kg,
sd_fetch(prim), sd_fetch(u), sd_fetch(v));
@@ -428,7 +428,7 @@ ccl_device_inline void
shader_setup_from_volume(KernelGlobals *kg, ShaderData *s
{
/* vectors */
sd->P = ray->P;
- sd->N = -ray->D;
+ sd->N = -ray->D;
sd->Ng = -ray->D;
sd->I = -ray->D;
sd->shader = SHADER_NONE;
@@ -564,7 +564,7 @@ ccl_device int shader_bsdf_sample(KernelGlobals *kg, const
ShaderData *sd,
for(sampled = 0; sampled < sd_fetch(num_closure); sampled++) {
const ShaderClosure *sc = sc_fetch(sampled);
-
+
if(CLOSURE_IS_BSDF(sc->type))
sum += sc->sample_weight;
}
@@ -574,7 +574,7 @@ ccl_device int shader_bsdf_sample(KernelGlobals *kg, const
ShaderData *sd,
for(sampled = 0; sampled < sd_fetch(num_closure); sampled++) {
const ShaderClosure *sc = sc_fetch(sampled);
-
+
if(CLOSURE_IS_BSDF(sc->type)) {
sum += sc->sample_weight;
@@ -658,7 +658,7 @@ ccl_device float3 shader_bsdf_alpha(KernelGlobals *kg,
ShaderData *sd)
alpha = max(alpha, make_float3(0.0f, 0.0f, 0.0f));
alpha = min(alpha, make_float3(1.0f, 1.0f, 1.0f));
-
+
return alpha;
}
diff --git a/intern/cycles/kernel/kernel_types.h
b/intern/cycles/kernel/kernel_types.h
index 2c0a207..35b33ce 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -579,7 +579,6 @@ typedef ccl_addr_space struct ShaderClosure {
float data0;
float data1;
float data2;
-
int pad1, pad2, pad3;
#ifdef __OSL__
@@ -989,14 +988,14 @@ typedef ccl_addr_space struct DebugData {
enum QueueNumber {
QUEUE_ACTIVE_AND_REGENERATED_RAYS, /* All active rays and
regenerated rays are enqueued here */
QUEUE_HITBG_BUFF_UPDATE_TOREGEN_RAYS, /* All
-
* 1.Background-hit rays,
-
* 2.Rays that has exited path-iteration but needs to update output
buffer
-
* 3.Rays to be regenerated
-
* are enqueued here */
- QUEUE_SHADOW_RAY_CAST_AO_RAYS, /* All rays for which a
shadow ray should be cast to determine radiance
- contribution for AO are
enqueued here */
+ * 1.Background-hit rays,
+ * 2.Rays that has exited
path-iteration but needs to update output buffer
+ * 3.Rays to be regenerated
+ * are enqueued here */
+ QUEUE_SHADOW_RAY_CAST_AO_RAYS, /* All rays for which a
shadow ray should be cast to determine radiance
+ contribution for AO are
enqueued here */
QUEUE_SHADOW_RAY_CAST_DL_RAYS, /* All rays for which a
shadow ray should be cast to determine radiance
- contributuin for direct
lighting are enqueued here */
+ contributuin for direct
lighting are enqueued here */
};
/* We use RAY_STATE_MASK to get ray_state (enums 0 to 5) */
diff --git a/intern/cycles/kernel/svm/svm_attribute.h
b/intern/cycles/kernel/svm/svm_attribute.h
index 5595823..e7ac434 100644
--- a/intern/cycles/kernel/svm/svm_attribute.h
+++ b/intern/cycles/kernel/svm/svm_attribute.h
@@ -30,7 +30,7 @@ ccl_device void svm_node_attr_init(KernelGlobals *kg,
ShaderData *sd,
attr_offset = (sd_fetch(type) & PRIMITIVE_ALL_CURVE)?
attr_offset + ATTR_PRIM_CURVE: attr_offset;
#endif
uint4 attr_map = kernel_tex_fetch(__attributes_map,
attr_offset);
-
+
while(attr_map.x != id) {
attr_offset += ATTR_PRIM_TYPES;
attr_map = kernel_tex_fetch(__attributes_map,
attr_offset);
diff --git a/intern/cycles/kernel/svm/svm_brick.h
b/intern/cycles/kernel/svm/svm_brick.h
index f6d09bf..fcf8f47 100644
--- a/intern/cycles/kernel/svm/svm_brick.h
+++ b/intern/cycles/kernel/svm/svm_brick.h
@@ -55,30 +55,30 @@ ccl_device_noinline float2 svm_brick(float3 p, float
mortar_size, float bias,
}
ccl_device void svm_node_tex_brick(KernelGlobals *kg, ShaderData *sd, float
*stack, uint4 node, int *offset)
-{
+{
uint4 node2 = read_node(kg, offset);
uint4 node3 = read_node(kg, offset);
-
+
/* Input and Output Sockets */
uint co_offset, color1_offset, color2_offset, mortar_offset,
scale_offset;
uint mortar_size_offset, bias_offset, brick_width_offset,
row_height_offset;
uint color_offset, fac_offset;
-
+
/* RNA properties */
uint offset_frequency, squash_frequency;
-
+
decode_node_uchar4(node.y, &co_offset, &color1_offset, &color2_offset,
&mortar_offset);
decode_node_uchar4(node.z, &scale_offset, &mortar_size_offset,
&bias_offset, &brick_width_offset);
decode_node_uchar4(node.w, &row_height_offset, &color_offset,
&fac_offset, NULL);
-
+
decode_node_uchar4(node2.x, &offset_frequency, &squash_frequency, NULL,
NULL);
float3 co = stack_load_float3(stack, co_offset);
-
+
float3 color1 = stack_load_float3(stack, color1_offset);
float3 color2 = stack_load_float3(stack, color2_offset);
float3 mortar = stack_load_float3(stack, mortar_offset);
-
+
float scale = stack_load_float_default(stack, scale_offset, node2.y);
float mortar_size = stack_load_float_default(stack, mortar_size_offset,
node2.z);
float bias = stack_load_float_default(stack, bias_offset, node2.w);
@@ -86,13 +86,13 @@ ccl_device void svm_node_tex_brick(KernelGlobals *kg,
ShaderData *sd, float *sta
float row_height = stack_load_float_default(stack, row_height_offset,
node3.y);
float offset_amount = __int_as_float(node3.z);
float squash_amount = __int_as_float(node3.w);
-
+
float2 f2 = svm_brick(co*scale, mortar_size, bias, brick_width,
row_height,
offset_amount, offset_frequency, squash_amount,
squash_frequency);
float tint = f2.x;
float f = f2.y;
-
+
if(f != 1.0f) {
float facm = 1.0f - tint;
color1 = facm * color1 + tint * color2;
diff --git a/intern/cycles/kernel/svm/svm_checker.h
b/intern/cycles/kernel/svm/svm_checker.h
index 57e4c8e..186bf7d 100644
--- a/intern/cycles/kernel/svm/svm_checker.h
+++ b/intern/cycles/kernel/svm/svm_checker.h
@@ -33,7 +33,7 @@ ccl_device_noinline float svm_checker(float3 p)
}
ccl_device void svm_node_tex_checker(KernelGlobals *kg, ShaderData *sd, float
*stack, uint4 node)
-{
+{
uint co_offset, color1_offset, color2_offset, scale_offset;
uint color_offset, fac_offset;
@@ -44,7 +44,7 @@ ccl_device void svm_node_tex_checker(KernelGlobals *kg,
ShaderData *sd, float *s
float3 color1 = stack_load_float3(stack, color1_offset);
float3 color2 = stack_load_float3(stack, color2_offset);
float scale = stack_load_float_default(stack, scale_offset, node.w);
-
+
float f = svm_checker(co*scale);
if(
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
