[Bf-blender-cvs] [b486088218f] blender2.7: Fix T60320: Cycles OpenCL volume rendering error on some drivers.
Brecht Van Lommel
noreply at git.blender.org
Tue Jan 8 15:59:40 CET 2019
Commit: b486088218f66810b97294f38f246e4650d32f2b
Author: Brecht Van Lommel
Date: Tue Jan 8 15:50:14 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBb486088218f66810b97294f38f246e4650d32f2b
Fix T60320: Cycles OpenCL volume rendering error on some drivers.
===================================================================
M intern/cycles/kernel/kernel_volume.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index d6d283c42c5..1df50504434 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -383,18 +383,22 @@ ccl_device int kernel_volume_sample_channel(float3 albedo, float3 throughput, fl
* Tracing". Matt Jen-Yuan Chiang, Peter Kutz, Brent Burley. SIGGRAPH 2016. */
float3 weights = fabs(throughput * albedo);
float sum_weights = weights.x + weights.y + weights.z;
+ float3 weights_pdf;
if(sum_weights > 0.0f) {
- *pdf = weights/sum_weights;
+ weights_pdf = weights/sum_weights;
}
else {
- *pdf = make_float3(1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f);
+ weights_pdf = make_float3(1.0f/3.0f, 1.0f/3.0f, 1.0f/3.0f);
}
- if(rand < pdf->x) {
+ *pdf = weights_pdf;
+
+ /* OpenCL does not support -> on float3, so don't use pdf->x. */
+ if(rand < weights_pdf.x) {
return 0;
}
- else if(rand < pdf->x + pdf->y) {
+ else if(rand < weights_pdf.x + weights_pdf.y) {
return 1;
}
else {
More information about the Bf-blender-cvs
mailing list