[Bf-blender-cvs] [8bed4e6] master: Fix T41362: CPU and GPU rendering gives different results

[Sergey Sharybin]

Commit: 8bed4e6040e0850fc2654b62cfd98d217c91ece0
Author: Sergey Sharybin
Date:   Mon Aug 11 22:29:27 2014 +0600
Branches: master
https://developer.blender.org/rB8bed4e6040e0850fc2654b62cfd98d217c91ece0

Fix T41362: CPU and GPU rendering gives different results

We can't really make CPU and GPU results look the same in all possible
circumstances, but here we can make them look close enough to each other
by making it so sobol pattern for bounce number is the smae for both
CPU and GPU.

This makes CPU and GPU render results look the same with low number of
samples, high number of samples was never an issue.

===================================================================

M	intern/cycles/kernel/kernel_types.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index bd788c6..f60d813 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -223,10 +223,9 @@ enum PathTraceDimension {
 	PRNG_PHASE_V = 9,
 	PRNG_PHASE = 10,
 	PRNG_SCATTER_DISTANCE = 11,
-	PRNG_BOUNCE_NUM = 12,
-#else
-	PRNG_BOUNCE_NUM = 8,
 #endif
+
+	PRNG_BOUNCE_NUM = 12,
 };
 
 enum SamplingPattern {