Commit: 54ea1bd0a5c730086b335626d8fe6d264d74a0b7
Author: Thomas Dinges
Date: Fri May 8 09:20:51 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rB54ea1bd0a5c730086b335626d8fe6d264d74a0b7
Cycles Kernel Split: Kill some more whitespace changes to mkae diff more clear.
===================================================================
M intern/cycles/kernel/closure/bsdf_hair.h
M intern/cycles/kernel/geom/geom_attribute.h
M intern/cycles/kernel/geom/geom_object.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/svm/svm_attribute.h
M intern/cycles/kernel/svm/svm_blackbody.h
M intern/cycles/kernel/svm/svm_closure.h
M intern/cycles/kernel/svm/svm_displace.h
M intern/cycles/kernel/svm/svm_geometry.h
M intern/cycles/kernel/svm/svm_tex_coord.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_hair.h
b/intern/cycles/kernel/closure/bsdf_hair.h
index c51ade8..1e81617 100644
--- a/intern/cycles/kernel/closure/bsdf_hair.h
+++ b/intern/cycles/kernel/closure/bsdf_hair.h
@@ -33,9 +33,9 @@
#ifndef __BSDF_HAIR_H__
#define __BSDF_HAIR_H__
-
CCL_NAMESPACE_BEGIN
+
ccl_device int bsdf_hair_reflection_setup(ShaderClosure *sc)
{
sc->type = CLOSURE_BSDF_HAIR_REFLECTION_ID;
diff --git a/intern/cycles/kernel/geom/geom_attribute.h
b/intern/cycles/kernel/geom/geom_attribute.h
index 7301f90..b95e8e0 100644
--- a/intern/cycles/kernel/geom/geom_attribute.h
+++ b/intern/cycles/kernel/geom/geom_attribute.h
@@ -57,6 +57,7 @@ ccl_device_inline int find_attribute(KernelGlobals *kg, const
ShaderData *sd, ui
}
/* Transform matrix attribute on meshes */
+
ccl_device Transform primitive_attribute_matrix(KernelGlobals *kg, const
ShaderData *sd, int offset)
{
Transform tfm;
diff --git a/intern/cycles/kernel/geom/geom_object.h
b/intern/cycles/kernel/geom/geom_object.h
index 9efc6cf..43ff75b 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -131,6 +131,7 @@ ccl_device_inline void
object_position_transform(KernelGlobals *kg, const Shader
}
/* Transform position from world to object space */
+
ccl_device_inline void object_inverse_position_transform(KernelGlobals *kg,
const ShaderData *sd, float3 *P)
{
#ifdef __OBJECT_MOTION__
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index fdcc366..d0933ab 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -378,6 +378,7 @@ ccl_device void shader_setup_from_displace(KernelGlobals
*kg, ShaderData *sd,
}
/* ShaderData setup from ray into background */
+
ccl_device_inline void shader_setup_from_background(KernelGlobals *kg,
ShaderData *sd, const Ray *ray, int bounce, int transparent_bounce)
{
/* vectors */
@@ -420,6 +421,7 @@ ccl_device_inline void
shader_setup_from_background(KernelGlobals *kg, ShaderDat
#endif
}
+/* ShaderData setup from point inside volume */
#ifdef __VOLUME__
ccl_device_inline void shader_setup_from_volume(KernelGlobals *kg, ShaderData
*sd, const Ray *ray, int bounce, int transparent_bounce)
@@ -794,6 +796,7 @@ ccl_device float3 shader_emissive_eval(KernelGlobals *kg,
ShaderData *sd)
}
/* Holdout */
+
ccl_device float3 shader_holdout_eval(KernelGlobals *kg, ShaderData *sd)
{
float3 weight = make_float3(0.0f, 0.0f, 0.0f);
@@ -1025,6 +1028,7 @@ ccl_device void shader_eval_volume(KernelGlobals *kg,
ShaderData *sd,
#endif
/* Displacement Evaluation */
+
ccl_device void shader_eval_displacement(KernelGlobals *kg, ShaderData *sd,
ShaderContext ctx)
{
sd_fetch(num_closure) = 0;
diff --git a/intern/cycles/kernel/kernel_shadow.h
b/intern/cycles/kernel/kernel_shadow.h
index ae8a9f9..c1fd7e8 100644
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -286,6 +286,7 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg,
ccl_addr_space PathStat
return blocked;
}
+
#endif
CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/svm/svm_attribute.h
b/intern/cycles/kernel/svm/svm_attribute.h
index 17ee91d..5595823 100644
--- a/intern/cycles/kernel/svm/svm_attribute.h
+++ b/intern/cycles/kernel/svm/svm_attribute.h
@@ -17,6 +17,7 @@
CCL_NAMESPACE_BEGIN
/* Attribute Node */
+
ccl_device void svm_node_attr_init(KernelGlobals *kg, ShaderData *sd,
uint4 node, NodeAttributeType *type,
NodeAttributeType *mesh_type, AttributeElement *elem, int *offset, uint
*out_offset)
diff --git a/intern/cycles/kernel/svm/svm_blackbody.h
b/intern/cycles/kernel/svm/svm_blackbody.h
index 8c7ed47..b750ad8 100644
--- a/intern/cycles/kernel/svm/svm_blackbody.h
+++ b/intern/cycles/kernel/svm/svm_blackbody.h
@@ -33,6 +33,7 @@
CCL_NAMESPACE_BEGIN
/* Blackbody Node */
+
ccl_device void svm_node_blackbody(KernelGlobals *kg, ShaderData *sd, float
*stack, uint temperature_offset, uint col_offset)
{
/* Input */
diff --git a/intern/cycles/kernel/svm/svm_closure.h
b/intern/cycles/kernel/svm/svm_closure.h
index 1b960e1..e747806 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -1,4 +1,3 @@
-
/*
* Copyright 2011-2013 Blender Foundation
*
@@ -266,7 +265,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
/* reflection */
ShaderClosure *sc = sc_fetch(sd_fetch(num_closure));
-
float3 weight = sc->weight;
float sample_weight = sc->sample_weight;
@@ -398,7 +396,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
}
else {
ShaderClosure *sc =
sc_fetch(sd_fetch(num_closure));
-
sc = svm_node_closure_get_bsdf(sd, mix_weight);
if(sc) {
@@ -431,7 +428,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
case CLOSURE_BSSRDF_CUBIC_ID:
case CLOSURE_BSSRDF_GAUSSIAN_ID: {
ShaderClosure *sc = sc_fetch(sd_fetch(num_closure));
-
float3 weight = sc->weight * mix_weight;
float sample_weight = fabsf(average(weight));
@@ -465,7 +461,6 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
sd_fetch(num_closure)++;
sc = sc_fetch(sd_fetch(num_closure));
- //sc++;
}
if(fabsf(weight.y) > 0.0f) {
@@ -675,6 +670,7 @@ ccl_device void svm_node_mix_closure(ShaderData *sd, float
*stack, uint4 node)
}
/* (Bump) normal */
+
ccl_device void svm_node_set_normal(KernelGlobals *kg, ShaderData *sd, float
*stack, uint in_direction, uint out_normal)
{
float3 normal = stack_load_float3(stack, in_direction);
diff --git a/intern/cycles/kernel/svm/svm_displace.h
b/intern/cycles/kernel/svm/svm_displace.h
index fa724dd..4598230 100644
--- a/intern/cycles/kernel/svm/svm_displace.h
+++ b/intern/cycles/kernel/svm/svm_displace.h
@@ -17,6 +17,7 @@
CCL_NAMESPACE_BEGIN
/* Bump Node */
+
ccl_device void svm_node_set_bump(KernelGlobals *kg, ShaderData *sd, float
*stack, uint4 node)
{
#ifdef __RAY_DIFFERENTIALS__
@@ -60,6 +61,7 @@ ccl_device void svm_node_set_bump(KernelGlobals *kg,
ShaderData *sd, float *stac
}
/* Displacement Node */
+
ccl_device void svm_node_set_displacement(ShaderData *sd, float *stack, uint
fac_offset)
{
float d = stack_load_float(stack, fac_offset);
diff --git a/intern/cycles/kernel/svm/svm_geometry.h
b/intern/cycles/kernel/svm/svm_geometry.h
index 0a1085b..3d2c32d 100644
--- a/intern/cycles/kernel/svm/svm_geometry.h
+++ b/intern/cycles/kernel/svm/svm_geometry.h
@@ -73,6 +73,7 @@ ccl_device void svm_node_geometry_bump_dy(KernelGlobals *kg,
ShaderData *sd, flo
}
/* Object Info */
+
ccl_device void svm_node_object_info(KernelGlobals *kg, ShaderData *sd, float
*stack, uint type, uint out_offset)
{
float data;
@@ -144,6 +145,7 @@ ccl_device void svm_node_particle_info(KernelGlobals *kg,
ShaderData *sd, float
#ifdef __HAIR__
/* Hair Info */
+
ccl_device void svm_node_hair_info(KernelGlobals *kg, ShaderData *sd, float
*stack, uint type, uint out_offset)
{
float data;
diff --git a/intern/cycles/kernel/svm/svm_tex_coord.h
b/intern/cycles/kernel/svm/svm_tex_coord.h
index f784a0a..3814d98 100644
--- a/intern/cycles/kernel/svm/svm_tex_coord.h
+++ b/intern/cycles/kernel/svm/svm_tex_coord.h
@@ -380,7 +380,6 @@ ccl_device void svm_node_tangent(KernelGlobals *kg,
ShaderData *sd, float *stack
}
object_normal_transform(kg, sd, &tangent);
-
tangent = cross(sd_fetch(N), normalize(cross(tangent, sd_fetch(N))));
stack_store_float3(stack, tangent_offset, tangent);
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
