Commit: 71bdbac6a4eedcf926bbf474886f50ada255f4d0
Author: Mai Lavelle
Date: Tue Aug 30 20:48:30 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB71bdbac6a4eedcf926bbf474886f50ada255f4d0
Cycles: Remove unused flag
===================================================================
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/osl/osl_shader.cpp
M intern/cycles/kernel/svm/svm_bump.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_types.h
b/intern/cycles/kernel/kernel_types.h
index ef1ba68..0646148 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -698,7 +698,6 @@ enum ShaderDataFlag {
SD_AO = (1 << 8), /* have ao closure? */
SD_TRANSPARENT = (1 << 9), /* have transparent closure? */
SD_BSDF_NEEDS_LCG = (1 << 10),
- SD_IN_BUMP_EVAL = (1 << 11), /* set if currently evaluating bump
shader */
SD_CLOSURE_FLAGS = (SD_EMISSION|SD_BSDF|SD_BSDF_HAS_EVAL|SD_BSSRDF|
SD_HOLDOUT|SD_ABSORPTION|SD_SCATTER|SD_AO|
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp
b/intern/cycles/kernel/osl/osl_shader.cpp
index 09d9df1..b584e6c 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -209,8 +209,6 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData
*sd, PathState *state
globals->P = TO_VEC3(sd->P);
globals->dPdx = TO_VEC3(sd->dP.dx);
globals->dPdy = TO_VEC3(sd->dP.dy);
-
- sd->flag |= SD_IN_BUMP_EVAL;
}
/* execute bump shader */
@@ -224,8 +222,6 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData
*sd, PathState *state
globals->P = TO_VEC3(P);
globals->dPdx = TO_VEC3(dPdx);
globals->dPdy = TO_VEC3(dPdy);
-
- sd->flag &= ~SD_IN_BUMP_EVAL;
}
/* surface shader */
diff --git a/intern/cycles/kernel/svm/svm_bump.h
b/intern/cycles/kernel/svm/svm_bump.h
index e99afc4..8538484 100644
--- a/intern/cycles/kernel/svm/svm_bump.h
+++ b/intern/cycles/kernel/svm/svm_bump.h
@@ -39,8 +39,6 @@ ccl_device void svm_node_enter_bump_eval(KernelGlobals *kg,
ShaderData *sd, floa
object_position_transform(kg, sd, &ccl_fetch(sd, dP).dx);
object_position_transform(kg, sd, &ccl_fetch(sd, dP).dy);
}
-
- ccl_fetch(sd, flag) |= SD_IN_BUMP_EVAL;
}
ccl_device void svm_node_leave_bump_eval(KernelGlobals *kg, ShaderData *sd,
float *stack, uint offset)
@@ -49,8 +47,6 @@ ccl_device void svm_node_leave_bump_eval(KernelGlobals *kg,
ShaderData *sd, floa
ccl_fetch(sd, P) = stack_load_float3(stack, offset+0);
ccl_fetch(sd, dP).dx = stack_load_float3(stack, offset+3);
ccl_fetch(sd, dP).dy = stack_load_float3(stack, offset+6);
-
- ccl_fetch(sd, flag) &= ~SD_IN_BUMP_EVAL;
}
CCL_NAMESPACE_END
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
