[Bf-blender-cvs] [2dccf5a] master: Cycles: Fix OpenCL split kernel compilation after recent CUDA 8 performance fix

Lukas Stockner noreply at git.blender.org
Fri Oct 7 18:51:37 CEST 2016


Commit: 2dccf5a6e881973858de2c230cb610a2ea3a03e1
Author: Lukas Stockner
Date:   Fri Oct 7 18:50:43 2016 +0200
Branches: master
https://developer.blender.org/rB2dccf5a6e881973858de2c230cb610a2ea3a03e1

Cycles: Fix OpenCL split kernel compilation after recent CUDA 8 performance fix

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

M	intern/cycles/kernel/split/kernel_scene_intersect.h

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

diff --git a/intern/cycles/kernel/split/kernel_scene_intersect.h b/intern/cycles/kernel/split/kernel_scene_intersect.h
index faa752c..fc4b4ee 100644
--- a/intern/cycles/kernel/split/kernel_scene_intersect.h
+++ b/intern/cycles/kernel/split/kernel_scene_intersect.h
@@ -109,9 +109,9 @@ ccl_device void kernel_scene_intersect(
 		lcg_state = lcg_state_init(&rng, &state, 0x51633e2d);
 	}
 
-	bool hit = scene_intersect(kg, &ray, visibility, isect, &lcg_state, difl, extmax);
+	bool hit = scene_intersect(kg, ray, visibility, isect, &lcg_state, difl, extmax);
 #else
-	bool hit = scene_intersect(kg, &ray, visibility, isect, NULL, 0.0f, 0.0f);
+	bool hit = scene_intersect(kg, ray, visibility, isect, NULL, 0.0f, 0.0f);
 #endif
 
 #ifdef __KERNEL_DEBUG__




More information about the Bf-blender-cvs mailing list