[Bf-blender-cvs] [7901f62] master: Cycles: Avoid redundant intersection pre-calculation

Sergey Sharybin noreply at git.blender.org
Mon Sep 19 15:38:20 CEST 2016


Commit: 7901f62a9d3305d664bcbf03bf30195c9690a0a2
Author: Sergey Sharybin
Date:   Mon Sep 19 15:14:21 2016 +0200
Branches: master
https://developer.blender.org/rB7901f62a9d3305d664bcbf03bf30195c9690a0a2

Cycles: Avoid redundant intersection pre-calculation

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

M	intern/cycles/kernel/bvh/qbvh_volume_all.h

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

diff --git a/intern/cycles/kernel/bvh/qbvh_volume_all.h b/intern/cycles/kernel/bvh/qbvh_volume_all.h
index ab4b700..0fe4454 100644
--- a/intern/cycles/kernel/bvh/qbvh_volume_all.h
+++ b/intern/cycles/kernel/bvh/qbvh_volume_all.h
@@ -405,7 +405,6 @@ ccl_device uint BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
 #  else
 				bvh_instance_pop_factor(kg, object, ray, &P, &dir, &idir, &t_fac);
 #  endif
-				triangle_intersect_precalc(dir, &isect_precalc);
 				/* Scale isect->t to adjust for instancing. */
 				for(int i = 0; i < num_hits_in_instance; i++) {
 					(isect_array-i-1)->t *= t_fac;
@@ -418,7 +417,6 @@ ccl_device uint BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
 #  else
 				bvh_instance_pop(kg, object, ray, &P, &dir, &idir, &ignore_t);
 #  endif
-				triangle_intersect_precalc(dir, &isect_precalc);
 			}
 
 			if(idir.x >= 0.0f) { near_x = 0; far_x = 1; } else { near_x = 1; far_x = 0; }




More information about the Bf-blender-cvs mailing list