[Bf-blender-cvs] [29ff834] soc-2014-cycles: Merge remote-tracking branch 'origin/master' into soc-2014-cycles

[Thomas Dinges]

Commit: 29ff8349dca6df75e9043e164892bb7266144836
Author: Thomas Dinges
Date:   Fri Jun 6 19:07:24 2014 +0200
https://developer.blender.org/rB29ff8349dca6df75e9043e164892bb7266144836

Merge remote-tracking branch 'origin/master' into soc-2014-cycles

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



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

diff --cc intern/cycles/kernel/kernel.h
index 902b335,b169b15..30e1393
--- a/intern/cycles/kernel/kernel.h
+++ b/intern/cycles/kernel/kernel.h
@@@ -84,20 -84,9 +84,20 @@@ void kernel_cpu_avx_convert_to_byte(Ker
  void kernel_cpu_avx_convert_to_half_float(KernelGlobals *kg, uchar4 *rgba, float *buffer,
  	float sample_scale, int x, int y, int offset, int stride);
  void kernel_cpu_avx_shader(KernelGlobals *kg, uint4 *input, float4 *output,
- 	int type, int i);
+ 	int type, int i, int sample);
  #endif
  
 +#ifdef WITH_CYCLES_OPTIMIZED_KERNEL_AVX2
 +void kernel_cpu_avx2_path_trace(KernelGlobals *kg, float *buffer, unsigned int *rng_state,
 +	int sample, int x, int y, int offset, int stride);
 +void kernel_cpu_avx2_convert_to_byte(KernelGlobals *kg, uchar4 *rgba, float *buffer,
 +	float sample_scale, int x, int y, int offset, int stride);
 +void kernel_cpu_avx2_convert_to_half_float(KernelGlobals *kg, uchar4 *rgba, float *buffer,
 +	float sample_scale, int x, int y, int offset, int stride);
 +void kernel_cpu_avx2_shader(KernelGlobals *kg, uint4 *input, float4 *output,
 +	int type, int i);
 +#endif
 +
  CCL_NAMESPACE_END
  
  #endif /* __KERNEL_H__ */