[Bf-blender-cvs] [55340a7] cycles_kernel_split: Merge branch 'master' into cycles_kernel_split

Sergey Sharybin noreply at git.blender.org
Sat Apr 4 10:49:50 CEST 2015


Commit: 55340a79f902490b0059751c18a498cc47ea5310
Author: Sergey Sharybin
Date:   Sat Apr 4 13:41:54 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB55340a79f902490b0059751c18a498cc47ea5310

Merge branch 'master' into cycles_kernel_split

Conflicts:
	intern/cycles/kernel/svm/svm_light_path.h

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



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

diff --cc intern/cycles/kernel/geom/geom_object.h
index 28fe10b,7df7101..e9c6864
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@@ -255,10 -240,10 +255,10 @@@ ccl_device_inline float object_random_n
  
  /* Particle ID from which this object was generated */
  
 -ccl_device_inline int object_particle_id(KernelGlobals *kg, int object)
 +ccl_device_inline int object_particle_id(__ADDR_SPACE__ KernelGlobals *kg, int object)
  {
  	if(object == OBJECT_NONE)
- 		return 0.0f;
+ 		return 0;
  
  	int offset = object*OBJECT_SIZE + OBJECT_PROPERTIES;
  	float4 f = kernel_tex_fetch(__objects, offset);
diff --cc intern/cycles/kernel/geom/geom_triangle_intersect.h
index f50d31d,b29fc2b..5bbc2c3
--- a/intern/cycles/kernel/geom/geom_triangle_intersect.h
+++ b/intern/cycles/kernel/geom/geom_triangle_intersect.h
@@@ -94,11 -94,10 +94,10 @@@ ccl_device_inline float xor_signmast(fl
  	return __int_as_float(__float_as_int(x) ^ y);
  }
  
 -ccl_device_inline bool triangle_intersect(KernelGlobals *kg,
 +ccl_device_inline bool triangle_intersect(__ADDR_SPACE__ KernelGlobals *kg,
                                            const IsectPrecalc *isect_precalc,
 -                                          Intersection *isect,
 +                                          __ADDR_SPACE__ Intersection *isect,
                                            float3 P,
-                                           float3 dir,
                                            uint visibility,
                                            int object,
                                            int triAddr)
diff --cc intern/cycles/kernel/svm/svm_light_path.h
index 79b087c,ffadafb..10fca82
--- a/intern/cycles/kernel/svm/svm_light_path.h
+++ b/intern/cycles/kernel/svm/svm_light_path.h
@@@ -31,10 -31,10 +31,10 @@@ ccl_device void svm_node_light_path(__A
  		case NODE_LP_reflection: info = (path_flag & PATH_RAY_REFLECT)? 1.0f: 0.0f; break;
  		case NODE_LP_transmission: info = (path_flag & PATH_RAY_TRANSMIT)? 1.0f: 0.0f; break;
  		case NODE_LP_volume_scatter: info = (path_flag & PATH_RAY_VOLUME_SCATTER)? 1.0f: 0.0f; break;
 -		case NODE_LP_backfacing: info = (sd->flag & SD_BACKFACING)? 1.0f: 0.0f; break;
 -		case NODE_LP_ray_length: info = sd->ray_length; break;
 -		case NODE_LP_ray_depth: info = (float)sd->ray_depth; break;
 -		case NODE_LP_ray_transparent: info = (float)sd->transparent_depth; break;
 +		case NODE_LP_backfacing: info = (sd_fetch(flag) & SD_BACKFACING)? 1.0f: 0.0f; break;
 +		case NODE_LP_ray_length: info = sd_fetch(ray_length); break;
 +		case NODE_LP_ray_depth: info = (float)sd_fetch(ray_depth); break;
- 		case NODE_LP_ray_transparent: info = sd_fetch(transparent_depth); break;
++		case NODE_LP_ray_transparent: info = (float)sd_fetch(transparent_depth); break;
  	}
  
  	stack_store_float(stack, out_offset, info);




More information about the Bf-blender-cvs mailing list