[Bf-blender-cvs] [999b5554a66] split-kernel-faster-building: Cycles: Remove early out that may cause threads to diverge before barrier

Mai Lavelle noreply at git.blender.org
Mon Nov 27 04:51:14 CET 2017


Commit: 999b5554a66ebfe2ded5832ded95a3970b6830e8
Author: Mai Lavelle
Date:   Sun Nov 26 20:55:59 2017 -0500
Branches: split-kernel-faster-building
https://developer.blender.org/rB999b5554a66ebfe2ded5832ded95a3970b6830e8

Cycles: Remove early out that may cause threads to diverge before barrier

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

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

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

diff --git a/intern/cycles/kernel/split/kernel_indirect_background.h b/intern/cycles/kernel/split/kernel_indirect_background.h
index 8158bc3360d..5e6b37742a5 100644
--- a/intern/cycles/kernel/split/kernel_indirect_background.h
+++ b/intern/cycles/kernel/split/kernel_indirect_background.h
@@ -57,10 +57,6 @@ ccl_device void kernel_indirect_background(KernelGlobals *kg, ccl_local_param un
 	                          kernel_split_params.queue_size,
 	                          0);
 
-	if(ray_index == QUEUE_EMPTY_SLOT) {
-		return;
-	}
-
 	if(IS_STATE(ray_state, ray_index, RAY_HIT_BACKGROUND)) {
 		ccl_global PathState *state = &kernel_split_state.path_state[ray_index];
 		PathRadiance *L = &kernel_split_state.path_radiance[ray_index];



More information about the Bf-blender-cvs mailing list