From 659e5234afcd09db6b9000990d66d3e59880e29a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 3 Jul 2015 11:05:28 +0200 Subject: [PATCH] Cycles: Use explicit indices for split kernel queues --- intern/cycles/kernel/kernel_types.h | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 2a70bfcb8f0..3f57d009c50 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -1015,16 +1015,19 @@ typedef ccl_addr_space struct DebugData { /* Queue names */ enum QueueNumber { - QUEUE_ACTIVE_AND_REGENERATED_RAYS, /* All active rays and regenerated rays are enqueued here */ - QUEUE_HITBG_BUFF_UPDATE_TOREGEN_RAYS, /* All - * 1.Background-hit rays, - * 2.Rays that has exited path-iteration but needs to update output buffer - * 3.Rays to be regenerated - * are enqueued here */ - QUEUE_SHADOW_RAY_CAST_AO_RAYS, /* All rays for which a shadow ray should be cast to determine radiance - contribution for AO are enqueued here */ - QUEUE_SHADOW_RAY_CAST_DL_RAYS, /* All rays for which a shadow ray should be cast to determine radiance - contributuin for direct lighting are enqueued here */ + QUEUE_ACTIVE_AND_REGENERATED_RAYS = 0, /* All active rays and regenerated rays are enqueued here. */ + QUEUE_HITBG_BUFF_UPDATE_TOREGEN_RAYS = 1, /* All + * 1. Background-hit rays, + * 2. Rays that has exited path-iteration but needs to update output buffer + * 3. Rays to be regenerated + * are enqueued here. + */ + QUEUE_SHADOW_RAY_CAST_AO_RAYS = 2, /* All rays for which a shadow ray should be cast to determine radiance + * contribution for AO are enqueued here. + */ + QUEUE_SHADOW_RAY_CAST_DL_RAYS = 3, /* All rays for which a shadow ray should be cast to determine radiance + * contributuin for direct lighting are enqueued here. + */ }; /* We use RAY_STATE_MASK to get ray_state (enums 0 to 5) */