Commit: b9311b5e5a51fec85e3bb3c1d3eaa8a2dcc839e3
Author: Sergey Sharybin
Date: Fri Dec 23 10:49:59 2016 +0100
Branches: master
https://developer.blender.org/rBb9311b5e5a51fec85e3bb3c1d3eaa8a2dcc839e3
Cycles: Make object flag names more obvious that hey are object and not shader
===================================================================
M intern/cycles/kernel/bvh/bvh_subsurface.h
M intern/cycles/kernel/bvh/qbvh_subsurface.h
M intern/cycles/kernel/geom/geom_motion_triangle_shader.h
M intern/cycles/kernel/geom/geom_primitive.h
M intern/cycles/kernel/geom/geom_triangle.h
M intern/cycles/kernel/kernel_bake.h
M intern/cycles/kernel/kernel_light.h
M intern/cycles/kernel/kernel_path.h
M intern/cycles/kernel/kernel_path_branched.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/osl/osl_services.cpp
M
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
M intern/cycles/kernel/svm/svm_wireframe.h
M intern/cycles/render/object.cpp
===================================================================
diff --git a/intern/cycles/kernel/bvh/bvh_subsurface.h
b/intern/cycles/kernel/bvh/bvh_subsurface.h
index d9623c94b2..889bbca21e 100644
--- a/intern/cycles/kernel/bvh/bvh_subsurface.h
+++ b/intern/cycles/kernel/bvh/bvh_subsurface.h
@@ -72,7 +72,7 @@ void BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
ss_isect->num_hits = 0;
const int object_flag = kernel_tex_fetch(__object_flag,
subsurface_object);
- if(!(object_flag & SD_TRANSFORM_APPLIED)) {
+ if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) {
#if BVH_FEATURE(BVH_MOTION)
Transform ob_itfm;
bvh_instance_motion_push(kg,
diff --git a/intern/cycles/kernel/bvh/qbvh_subsurface.h
b/intern/cycles/kernel/bvh/qbvh_subsurface.h
index ccd36df034..84dc400313 100644
--- a/intern/cycles/kernel/bvh/qbvh_subsurface.h
+++ b/intern/cycles/kernel/bvh/qbvh_subsurface.h
@@ -61,7 +61,7 @@ ccl_device void BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals
*kg,
ss_isect->num_hits = 0;
const int object_flag = kernel_tex_fetch(__object_flag,
subsurface_object);
- if(!(object_flag & SD_TRANSFORM_APPLIED)) {
+ if(!(object_flag & SD_OBJECT_TRANSFORM_APPLIED)) {
#if BVH_FEATURE(BVH_MOTION)
Transform ob_itfm;
bvh_instance_motion_push(kg,
diff --git a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
b/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
index c5dbc6a2f5..5b1e014f85 100644
--- a/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
+++ b/intern/cycles/kernel/geom/geom_motion_triangle_shader.h
@@ -81,7 +81,7 @@ ccl_device_noinline void
motion_triangle_shader_setup(KernelGlobals *kg,
}
/* Compute face normal. */
float3 Ng;
- if(ccl_fetch(sd, flag) & SD_NEGATIVE_SCALE_APPLIED) {
+ if(ccl_fetch(sd, flag) & SD_OBJECT_NEGATIVE_SCALE_APPLIED) {
Ng = normalize(cross(verts[2] - verts[0], verts[1] - verts[0]));
}
else {
diff --git a/intern/cycles/kernel/geom/geom_primitive.h
b/intern/cycles/kernel/geom/geom_primitive.h
index 4384c2093e..dba82588db 100644
--- a/intern/cycles/kernel/geom/geom_primitive.h
+++ b/intern/cycles/kernel/geom/geom_primitive.h
@@ -157,7 +157,7 @@ ccl_device_inline float4
primitive_motion_vector(KernelGlobals *kg, ShaderData *
if(is_curve_primitive) {
center = curve_motion_center_location(kg, sd);
- if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED))
+ if(!(ccl_fetch(sd, flag) & SD_OBJECT_TRANSFORM_APPLIED))
object_position_transform(kg, sd, ¢er);
}
else
diff --git a/intern/cycles/kernel/geom/geom_triangle.h
b/intern/cycles/kernel/geom/geom_triangle.h
index 17538872ea..9ed619f0bb 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)
const float3 v2 = float4_to_float3(kernel_tex_fetch(__prim_tri_verts,
tri_vindex.w+2));
/* return normal */
- if(ccl_fetch(sd, flag) & SD_NEGATIVE_SCALE_APPLIED)
+ if(ccl_fetch(sd, flag) & SD_OBJECT_NEGATIVE_SCALE_APPLIED)
return normalize(cross(v2 - v0, v1 - v0));
else
return normalize(cross(v1 - v0, v2 - v0));
@@ -55,7 +55,7 @@ ccl_device_inline void triangle_point_normal(KernelGlobals
*kg, int object, int
int object_flag = kernel_tex_fetch(__object_flag, object);
/* compute normal */
- if(object_flag & SD_NEGATIVE_SCALE_APPLIED)
+ if(object_flag & SD_OBJECT_NEGATIVE_SCALE_APPLIED)
*Ng = normalize(cross(v2 - v0, v1 - v0));
else
*Ng = normalize(cross(v1 - v0, v2 - v0));
diff --git a/intern/cycles/kernel/kernel_bake.h
b/intern/cycles/kernel/kernel_bake.h
index c32ac6ccf4..5bcc57cdcd 100644
--- a/intern/cycles/kernel/kernel_bake.h
+++ b/intern/cycles/kernel/kernel_bake.h
@@ -320,7 +320,7 @@ ccl_device void kernel_bake_evaluate(KernelGlobals *kg,
ccl_global uint4 *input,
P, Ng, Ng,
shader, object, prim,
u, v, 1.0f, 0.5f,
- !(kernel_tex_fetch(__object_flag, object) &
SD_TRANSFORM_APPLIED),
+ !(kernel_tex_fetch(__object_flag, object) &
SD_OBJECT_TRANSFORM_APPLIED),
LAMP_NONE);
sd.I = sd.N;
diff --git a/intern/cycles/kernel/kernel_light.h
b/intern/cycles/kernel/kernel_light.h
index d4cc36d149..a2909cec1a 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -767,7 +767,7 @@ ccl_device void object_transform_light_sample(KernelGlobals
*kg, LightSample *ls
{
#ifdef __INSTANCING__
/* instance transform */
- if(!(kernel_tex_fetch(__object_flag, object) & SD_TRANSFORM_APPLIED)) {
+ if(!(kernel_tex_fetch(__object_flag, object) &
SD_OBJECT_TRANSFORM_APPLIED)) {
# ifdef __OBJECT_MOTION__
Transform itfm;
Transform tfm = object_fetch_transform_motion_test(kg, object,
time, &itfm);
diff --git a/intern/cycles/kernel/kernel_path.h
b/intern/cycles/kernel/kernel_path.h
index e25f259736..557c308b74 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -777,11 +777,11 @@ ccl_device_inline float4
kernel_path_integrate(KernelGlobals *kg,
/* holdout */
#ifdef __HOLDOUT__
- if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) && (state.flag &
PATH_RAY_CAMERA)) {
+ if((sd.flag & (SD_HOLDOUT|SD_OBJECT_HOLDOUT_MASK)) &&
(state.flag & PATH_RAY_CAMERA)) {
if(kernel_data.background.transparent) {
float3 holdout_weight;
- if(sd.flag & SD_HOLDOUT_MASK)
+ if(sd.flag & SD_OBJECT_HOLDOUT_MASK)
holdout_weight = make_float3(1.0f,
1.0f, 1.0f);
else
holdout_weight =
shader_holdout_eval(kg, &sd);
@@ -790,7 +790,7 @@ ccl_device_inline float4
kernel_path_integrate(KernelGlobals *kg,
L_transparent +=
average(holdout_weight*throughput);
}
- if(sd.flag & SD_HOLDOUT_MASK)
+ if(sd.flag & SD_OBJECT_HOLDOUT_MASK)
break;
}
#endif /* __HOLDOUT__ */
diff --git a/intern/cycles/kernel/kernel_path_branched.h
b/intern/cycles/kernel/kernel_path_branched.h
index 72a8d98ac0..4ec0ac8e8c 100644
--- a/intern/cycles/kernel/kernel_path_branched.h
+++ b/intern/cycles/kernel/kernel_path_branched.h
@@ -473,11 +473,11 @@ ccl_device float4
kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
/* holdout */
#ifdef __HOLDOUT__
- if(sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) {
+ if(sd.flag & (SD_HOLDOUT|SD_OBJECT_HOLDOUT_MASK)) {
if(kernel_data.background.transparent) {
float3 holdout_weight;
- if(sd.flag & SD_HOLDOUT_MASK)
+ if(sd.flag & SD_OBJECT_HOLDOUT_MASK)
holdout_weight = make_float3(1.0f,
1.0f, 1.0f);
else
holdout_weight =
shader_holdout_eval(kg, &sd);
@@ -486,7 +486,7 @@ ccl_device float4
kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
L_transparent +=
average(holdout_weight*throughput);
}
- if(sd.flag & SD_HOLDOUT_MASK)
+ if(sd.flag & SD_OBJECT_HOLDOUT_MASK)
break;
}
#endif /* __HOLDOUT__ */
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index c1b3153d8f..d7a9167aaf 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -298,7 +298,7 @@ ccl_device_inline void
shader_setup_from_sample(KernelGlobals *kg,
ccl_fetch(sd, N) = triangle_smooth_normal(kg,
ccl_fetch(sd, prim), ccl_fetch(sd, u), ccl_fetch(sd, v));
#ifdef __INSTANCING__
- if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED)) {
+ if(!(ccl_fetch(sd, flag) &
SD_OBJECT_TRANSFORM_APPLIED)) {
object_normal_transform_auto(kg, sd,
&ccl_fetch(sd, N));
}
#endif
@@ -309,7 +309,7 @@ ccl_device_inline void
shader_setup_from_sample(KernelGlobals *kg,
triangle_dPdudv(kg, ccl_fetch(sd, prim), &ccl_fetch(sd, dPdu),
&ccl_fetch(sd, dPdv));
# ifdef __INSTANCING__
- if(!(ccl_fetch(sd, flag) & SD_TRANSFORM_APPLIED)) {
+ if(!(ccl_fetch(sd, flag) & SD_OBJECT_TRANSFORM_APPLIED)) {
object_dir_transform_auto(kg, sd, &ccl_fetch(sd, dPdu));
object_dir_transform_auto(kg, sd, &ccl_fetch(sd, dPdv));
}
@@ -364,7 +364,7 @@ ccl_device void shader_setup_from_displace(KernelGlobals
*kg, ShaderData *sd,
P, Ng, I,
shader, object, prim,
u, v, 0.0f, 0.5f,
- !(kernel_tex_fetch(__object_flag, object) &
SD_TRANSFORM_APPLIED),
+ !(kernel_tex_fetch(__object_flag, object) &
SD_OBJECT_TRANSFORM_APPLIED),
LAMP_NONE);
}
diff --git a/intern/cycles/kernel/kernel_types.h
b/intern/cycles/kernel/kernel_types.h
index 4180465d1a..a826cda702 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -732,16 +732,16 @@ enum ShaderDataFlag {
SD_VOLUME_CUBIC|SD_HAS_BUMP|SD_HAS_DISPLACEMENT|SD_HAS_CONSTANT_EMISSION),
/* object flags */
- SD_HOLDOUT_MASK = (1 << 24), /* holdout for camera rays */
- SD_OBJECT_MOTION = (1 << 25), /* has object motion blur */
- SD_TRANSFORM_APPLIED = (1 << 26), /* vertices have transform
applied */
- SD_NEGATIVE_SCALE_APPLIED = (1 << 27), /* vertices have negative
scale applied */
- SD_OBJECT_HAS_VOLUME = (1 << 28), /* object has a volume shader
*/
- SD_OBJECT_INTERSECTS_VOLUME = (1 << 29), /* object intersects AABB of
an object with volume shader */
- SD_OBJECT_HAS_VERTEX_MOTION = (1 << 30), /* has position for motion
vertices */
-
- SD_OBJECT_FLAGS =
(SD_HOLDOUT_MASK|SD_OBJECT_MOTION|SD_TRANSFORM_APPLIED|
- SD_NEGATIVE_SCALE_APPLIED|SD_OBJECT_HAS_VOLUME|
+ SD_OBJECT_HOLDOUT_MASK = (1 << 24), /* holdout for camera
rays */
+ SD_OBJECT_MOTION = (1 << 25), /* has object motion
blur */
+ SD_OBJECT_TRANSFORM_APPLIED = (1 << 26), /* vertices have
transform applied */
+ SD_OBJECT_NEGATIVE_SCALE_APPLIED = (1 << 27), /* vertices have
negative scale applied */
+ SD_OBJECT_HAS_VOLUME = (1 << 28), /* object has a volume
shader */
+ SD_OBJECT_INTERSECTS_VOLUME = (1 << 29), /* object intersects
AABB of an object with volume shader */
+ SD_OBJECT_HAS_VERTEX_MOTION = (1 << 30), /* has position for
motion vertices */
+
+ SD_OBJECT_FLAGS =
(SD_OBJECT_HOLDOUT_MASK|SD_OBJECT_MOTION|SD_OBJECT_TRANSFORM_APPLIED|
+ SD_OBJECT_NE
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
