Commit: af668ecd6ff13b844901b5ffb38258c4e4aad14a
Author: Thomas Dinges
Date: Thu May 7 12:32:44 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rBaf668ecd6ff13b844901b5ffb38258c4e4aad14a
Cleanup: Remove some unneeded white space changes, to make diff clearer
===================================================================
M intern/cycles/kernel/closure/bsdf_hair.h
M intern/cycles/kernel/geom/geom_curve.h
M intern/cycles/kernel/geom/geom_object.h
M intern/cycles/kernel/geom/geom_primitive.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/render/session.cpp
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf_hair.h
b/intern/cycles/kernel/closure/bsdf_hair.h
index edb2d2b..c51ade8 100644
--- a/intern/cycles/kernel/closure/bsdf_hair.h
+++ b/intern/cycles/kernel/closure/bsdf_hair.h
@@ -33,6 +33,7 @@
#ifndef __BSDF_HAIR_H__
#define __BSDF_HAIR_H__
+
CCL_NAMESPACE_BEGIN
ccl_device int bsdf_hair_reflection_setup(ShaderClosure *sc)
diff --git a/intern/cycles/kernel/geom/geom_curve.h
b/intern/cycles/kernel/geom/geom_curve.h
index 82ab803..ec6c790 100644
--- a/intern/cycles/kernel/geom/geom_curve.h
+++ b/intern/cycles/kernel/geom/geom_curve.h
@@ -98,7 +98,6 @@ ccl_device float3 curve_attribute_float3(KernelGlobals *kg,
const ShaderData *sd
}
}
-
/* Curve thickness */
ccl_device float curve_thickness(KernelGlobals *kg, ShaderData *sd)
@@ -129,7 +128,6 @@ ccl_device float curve_thickness(KernelGlobals *kg,
ShaderData *sd)
/* Curve location for motion pass, linear interpolation between keys and
* ignoring radius because we do the same for the motion keys */
-
ccl_device float3 curve_motion_center_location(KernelGlobals *kg, ShaderData
*sd)
{
float4 curvedata = kernel_tex_fetch(__curves, sd->prim);
@@ -144,7 +142,6 @@ ccl_device float3
curve_motion_center_location(KernelGlobals *kg, ShaderData *sd
return float4_to_float3(P_curve[1]) * sd->u +
float4_to_float3(P_curve[0]) * (1.0f - sd->u);
}
-
/* Curve tangent normal */
ccl_device float3 curve_tangent_normal(KernelGlobals *kg, ShaderData *sd)
diff --git a/intern/cycles/kernel/geom/geom_object.h
b/intern/cycles/kernel/geom/geom_object.h
index 4907a34..9efc6cf 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -41,6 +41,7 @@ enum ObjectVectorTransform {
};
/* Object to world space transformation */
+
ccl_device_inline Transform object_fetch_transform(KernelGlobals *kg, int
object, enum ObjectTransform type)
{
int offset = object*OBJECT_SIZE + (int)type;
@@ -118,6 +119,7 @@ ccl_device_inline Transform
object_fetch_transform_motion_test(KernelGlobals *kg
#endif
/* Transform position from object to world space */
+
ccl_device_inline void object_position_transform(KernelGlobals *kg, const
ShaderData *sd, float3 *P)
{
#ifdef __OBJECT_MOTION__
@@ -140,6 +142,7 @@ ccl_device_inline void
object_inverse_position_transform(KernelGlobals *kg, cons
}
/* Transform normal from world to object space */
+
ccl_device_inline void object_inverse_normal_transform(KernelGlobals *kg,
const ShaderData *sd, float3 *N)
{
#ifdef __OBJECT_MOTION__
@@ -151,6 +154,7 @@ ccl_device_inline void
object_inverse_normal_transform(KernelGlobals *kg, const
}
/* Transform normal from object to world space */
+
ccl_device_inline void object_normal_transform(KernelGlobals *kg, const
ShaderData *sd, float3 *N)
{
#ifdef __OBJECT_MOTION__
@@ -162,6 +166,7 @@ ccl_device_inline void
object_normal_transform(KernelGlobals *kg, const ShaderDa
}
/* Transform direction vector from object to world space */
+
ccl_device_inline void object_dir_transform(KernelGlobals *kg, const
ShaderData *sd, float3 *D)
{
#ifdef __OBJECT_MOTION__
@@ -173,6 +178,7 @@ ccl_device_inline void object_dir_transform(KernelGlobals
*kg, const ShaderData
}
/* Transform direction vector from world to object space */
+
ccl_device_inline void object_inverse_dir_transform(KernelGlobals *kg, const
ShaderData *sd, float3 *D)
{
#ifdef __OBJECT_MOTION__
@@ -183,6 +189,8 @@ ccl_device_inline void
object_inverse_dir_transform(KernelGlobals *kg, const Sha
#endif
}
+/* Object center position */
+
ccl_device_inline float3 object_location(KernelGlobals *kg, const ShaderData
*sd)
{
if(sd_fetch(object) == OBJECT_NONE)
@@ -284,6 +292,7 @@ ccl_device_inline void object_motion_info(KernelGlobals
*kg, int object, int *nu
}
/* Pass ID for shader */
+
ccl_device int shader_pass_id(KernelGlobals *kg, const ShaderData *sd)
{
return kernel_tex_fetch(__shader_flag, (sd_fetch(shader) &
SHADER_MASK)*2 + 1);
@@ -414,6 +423,7 @@ ccl_device_inline void qbvh_instance_push(KernelGlobals *kg,
#endif
/* Transorm ray to exit static object in BVH */
+
ccl_device_inline void bvh_instance_pop(KernelGlobals *kg, int object, const
Ray *ray, float3 *P, float3 *dir, float3 *idir, ccl_addr_space float *t)
{
if(*t != FLT_MAX) {
diff --git a/intern/cycles/kernel/geom/geom_primitive.h
b/intern/cycles/kernel/geom/geom_primitive.h
index 5769bb8..365d133 100644
--- a/intern/cycles/kernel/geom/geom_primitive.h
+++ b/intern/cycles/kernel/geom/geom_primitive.h
@@ -22,6 +22,7 @@
CCL_NAMESPACE_BEGIN
/* Generic primitive attribute reading functions */
+
ccl_device float primitive_attribute_float(KernelGlobals *kg, const ShaderData
*sd, AttributeElement elem, int offset, float *dx, float *dy)
{
if(sd_fetch(type) & PRIMITIVE_ALL_TRIANGLE) {
@@ -44,7 +45,6 @@ ccl_device float primitive_attribute_float(KernelGlobals *kg,
const ShaderData *
}
}
-
ccl_device float3 primitive_attribute_float3(KernelGlobals *kg, const
ShaderData *sd, AttributeElement elem, int offset, float3 *dx, float3 *dy)
{
if(sd_fetch(type) & PRIMITIVE_ALL_TRIANGLE) {
@@ -68,6 +68,7 @@ ccl_device float3 primitive_attribute_float3(KernelGlobals
*kg, const ShaderData
}
/* Default UV coordinate */
+
ccl_device float3 primitive_uv(KernelGlobals *kg, ShaderData *sd)
{
AttributeElement elem_uv;
@@ -82,6 +83,7 @@ ccl_device float3 primitive_uv(KernelGlobals *kg, ShaderData
*sd)
}
/* Ptex coordinates */
+
ccl_device bool primitive_ptex(KernelGlobals *kg, ShaderData *sd, float2 *uv,
int *face_id)
{
/* storing ptex data as attributes is not memory efficient but simple
for tests */
@@ -102,6 +104,7 @@ ccl_device bool primitive_ptex(KernelGlobals *kg,
ShaderData *sd, float2 *uv, in
}
/* Surface tangent */
+
ccl_device float3 primitive_tangent(KernelGlobals *kg, ShaderData *sd)
{
#ifdef __HAIR__
@@ -134,6 +137,7 @@ ccl_device float3 primitive_tangent(KernelGlobals *kg,
ShaderData *sd)
}
/* Motion vector for motion pass */
+
ccl_device float4 primitive_motion_vector(KernelGlobals *kg, ShaderData *sd)
{
/* center position */
@@ -225,6 +229,5 @@ ccl_device float4 primitive_motion_vector(KernelGlobals
*kg, ShaderData *sd)
return make_float4(motion_pre.x, motion_pre.y, motion_post.x,
motion_post.y);
}
-
CCL_NAMESPACE_END
diff --git a/intern/cycles/kernel/geom/geom_triangle.h
b/intern/cycles/kernel/geom/geom_triangle.h
index 51ce763..1914ee1 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@ -23,10 +23,6 @@
CCL_NAMESPACE_BEGIN
-
-
-
-
/* normal on triangle */
ccl_device_inline float3 triangle_normal(KernelGlobals *kg, ShaderData *sd)
{
diff --git a/intern/cycles/render/session.cpp b/intern/cycles/render/session.cpp
index af69294..9d6e925 100644
--- a/intern/cycles/render/session.cpp
+++ b/intern/cycles/render/session.cpp
@@ -815,7 +815,6 @@ void Session::update_status_time(bool show_pause, bool
show_done)
string status, substatus;
if(!params.progressive) {
-
bool is_gpu = params.device.type == DEVICE_CUDA ||
params.device.type == DEVICE_OPENCL;
bool is_multidevice = params.device.multi_devices.size() > 1;
bool is_cpu = params.device.type == DEVICE_CPU;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
