Commit: 7b0a46b1ff4409a599751392329341c161c7e3c0
Author: Brecht Van Lommel
Date: Tue Jan 7 15:48:04 2014 +0100
https://developer.blender.org/rB7b0a46b1ff4409a599751392329341c161c7e3c0
Fix CUDA/OpenCL compile errors in scattering commit.
===================================================================
M intern/cycles/kernel/closure/bsdf.h
M intern/cycles/kernel/kernel_path_state.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/svm/svm_closure.h
===================================================================
diff --git a/intern/cycles/kernel/closure/bsdf.h
b/intern/cycles/kernel/closure/bsdf.h
index 8d458c5..24b54cd 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -127,9 +127,11 @@ ccl_device int bsdf_sample(KernelGlobals *kg, const
ShaderData *sd, const Shader
eval, omega_in, &domega_in->dx, &domega_in->dy,
pdf);
break;
#endif
+#ifdef __VOLUME__
case CLOSURE_VOLUME_HENYEY_GREENSTEIN_ID:
label = volume_henyey_greenstein_sample(sc, sd->I,
sd->dI.dx, sd->dI.dy, randu, randv, eval, omega_in, &domega_in->dx,
&domega_in->dy, pdf);
break;
+#endif
default:
label = LABEL_NONE;
break;
diff --git a/intern/cycles/kernel/kernel_path_state.h
b/intern/cycles/kernel/kernel_path_state.h
index 5def19f..d9af629 100644
--- a/intern/cycles/kernel/kernel_path_state.h
+++ b/intern/cycles/kernel/kernel_path_state.h
@@ -153,8 +153,10 @@ ccl_device_inline float
path_state_terminate_probability(KernelGlobals *kg, Path
if((state->bounce >= kernel_data.integrator.max_bounce) ||
(state->diffuse_bounce >=
kernel_data.integrator.max_diffuse_bounce) ||
(state->glossy_bounce >=
kernel_data.integrator.max_glossy_bounce) ||
- (state->transmission_bounce >=
kernel_data.integrator.max_transmission_bounce) ||
- (state->volume_bounce >=
kernel_data.integrator.max_volume_bounce))
+#ifdef __VOLUME__
+ (state->volume_bounce >=
kernel_data.integrator.max_volume_bounce) ||
+#endif
+ (state->transmission_bounce >=
kernel_data.integrator.max_transmission_bounce))
{
return 0.0f;
}
diff --git a/intern/cycles/kernel/kernel_shader.h
b/intern/cycles/kernel/kernel_shader.h
index 35844dc..b113e90 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -1060,8 +1060,6 @@ ccl_device int shader_phase_sample_closure(KernelGlobals
*kg, const ShaderData *
return label;
}
-#endif
-
/* Volume Evaluation */
ccl_device void shader_eval_volume(KernelGlobals *kg, ShaderData *sd,
@@ -1114,6 +1112,8 @@ 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)
diff --git a/intern/cycles/kernel/svm/svm_closure.h
b/intern/cycles/kernel/svm/svm_closure.h
index 70ac1d3..42e66a7 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -481,6 +481,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg,
ShaderData *sd, float *
ccl_device void svm_node_closure_volume(KernelGlobals *kg, ShaderData *sd,
float *stack, uint4 node, int path_flag)
{
+#ifdef __VOLUME__
uint type, param1_offset, param2_offset;
#ifdef __MULTI_CLOSURE__
@@ -521,6 +522,7 @@ ccl_device void svm_node_closure_volume(KernelGlobals *kg,
ShaderData *sd, float
default:
break;
}
+#endif
}
ccl_device void svm_node_closure_emission(ShaderData *sd, float *stack, uint4
node)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
