[Bf-blender-cvs] [659e523] master: Cycles: Use explicit indices for split kernel queues
Sergey Sharybin
noreply at git.blender.org
Fri Jul 3 11:26:11 CEST 2015
Commit: 659e5234afcd09db6b9000990d66d3e59880e29a
Author: Sergey Sharybin
Date: Fri Jul 3 11:05:28 2015 +0200
Branches: master
https://developer.blender.org/rB659e5234afcd09db6b9000990d66d3e59880e29a
Cycles: Use explicit indices for split kernel queues
===================================================================
M intern/cycles/kernel/kernel_types.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 2a70bfc..3f57d00 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) */
More information about the Bf-blender-cvs
mailing list