Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/kernel/bvh/bvh_volume.h
| Show All 29 Lines | |||||
| * BVH_MOTION: motion blur rendering | * BVH_MOTION: motion blur rendering | ||||
| */ | */ | ||||
| #ifndef __KERNEL_GPU__ | #ifndef __KERNEL_GPU__ | ||||
| ccl_device | ccl_device | ||||
| #else | #else | ||||
| ccl_device_inline | ccl_device_inline | ||||
| #endif | #endif | ||||
| bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg, | bool BVH_FUNCTION_FULL_NAME(BVH)(const KernelGlobals *kg, | ||||
| const Ray *ray, | const Ray *ray, | ||||
| Intersection *isect, | Intersection *isect, | ||||
| const uint visibility) | const uint visibility) | ||||
| { | { | ||||
| /* todo: | /* todo: | ||||
| * - test if pushing distance on the stack helps (for non shadow rays) | * - test if pushing distance on the stack helps (for non shadow rays) | ||||
| * - separate version for shadow rays | * - separate version for shadow rays | ||||
| * - likely and unlikely for if() statements | * - likely and unlikely for if() statements | ||||
| ▲ Show 20 Lines • Show All 95 Lines • ▼ Show 20 Lines | #endif | ||||
| /* only primitives from volume object */ | /* only primitives from volume object */ | ||||
| uint tri_object = (object == OBJECT_NONE) ? | uint tri_object = (object == OBJECT_NONE) ? | ||||
| kernel_tex_fetch(__prim_object, prim_addr) : | kernel_tex_fetch(__prim_object, prim_addr) : | ||||
| object; | object; | ||||
| int object_flag = kernel_tex_fetch(__object_flag, tri_object); | int object_flag = kernel_tex_fetch(__object_flag, tri_object); | ||||
| if ((object_flag & SD_OBJECT_HAS_VOLUME) == 0) { | if ((object_flag & SD_OBJECT_HAS_VOLUME) == 0) { | ||||
| continue; | continue; | ||||
| } | } | ||||
| triangle_intersect(kg, isect, P, dir, visibility, object, prim_addr); | triangle_intersect(kg, isect, P, dir, isect->t, visibility, object, prim_addr); | ||||
| } | } | ||||
| break; | break; | ||||
| } | } | ||||
| #if BVH_FEATURE(BVH_MOTION) | #if BVH_FEATURE(BVH_MOTION) | ||||
| case PRIMITIVE_MOTION_TRIANGLE: { | case PRIMITIVE_MOTION_TRIANGLE: { | ||||
| /* intersect ray against primitive */ | /* intersect ray against primitive */ | ||||
| for (; prim_addr < prim_addr2; prim_addr++) { | for (; prim_addr < prim_addr2; prim_addr++) { | ||||
| kernel_assert(kernel_tex_fetch(__prim_type, prim_addr) == type); | kernel_assert(kernel_tex_fetch(__prim_type, prim_addr) == type); | ||||
| /* only primitives from volume object */ | /* only primitives from volume object */ | ||||
| uint tri_object = (object == OBJECT_NONE) ? | uint tri_object = (object == OBJECT_NONE) ? | ||||
| kernel_tex_fetch(__prim_object, prim_addr) : | kernel_tex_fetch(__prim_object, prim_addr) : | ||||
| object; | object; | ||||
| int object_flag = kernel_tex_fetch(__object_flag, tri_object); | int object_flag = kernel_tex_fetch(__object_flag, tri_object); | ||||
| if ((object_flag & SD_OBJECT_HAS_VOLUME) == 0) { | if ((object_flag & SD_OBJECT_HAS_VOLUME) == 0) { | ||||
| continue; | continue; | ||||
| } | } | ||||
| motion_triangle_intersect( | motion_triangle_intersect( | ||||
| kg, isect, P, dir, ray->time, visibility, object, prim_addr); | kg, isect, P, dir, isect->t, ray->time, visibility, object, prim_addr); | ||||
| } | } | ||||
| break; | break; | ||||
| } | } | ||||
| #endif | #endif | ||||
| default: { | default: { | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| else { | else { | ||||
| /* instance push */ | /* instance push */ | ||||
| object = kernel_tex_fetch(__prim_object, -prim_addr - 1); | object = kernel_tex_fetch(__prim_object, -prim_addr - 1); | ||||
| int object_flag = kernel_tex_fetch(__object_flag, object); | int object_flag = kernel_tex_fetch(__object_flag, object); | ||||
| if (object_flag & SD_OBJECT_HAS_VOLUME) { | if (object_flag & SD_OBJECT_HAS_VOLUME) { | ||||
| #if BVH_FEATURE(BVH_MOTION) | #if BVH_FEATURE(BVH_MOTION) | ||||
| isect->t = bvh_instance_motion_push( | isect->t *= bvh_instance_motion_push(kg, object, ray, &P, &dir, &idir, &ob_itfm); | ||||
| kg, object, ray, &P, &dir, &idir, isect->t, &ob_itfm); | |||||
| #else | #else | ||||
| isect->t = bvh_instance_push(kg, object, ray, &P, &dir, &idir, isect->t); | isect->t *= bvh_instance_push(kg, object, ray, &P, &dir, &idir); | ||||
| #endif | #endif | ||||
| ++stack_ptr; | ++stack_ptr; | ||||
| kernel_assert(stack_ptr < BVH_STACK_SIZE); | kernel_assert(stack_ptr < BVH_STACK_SIZE); | ||||
| traversal_stack[stack_ptr] = ENTRYPOINT_SENTINEL; | traversal_stack[stack_ptr] = ENTRYPOINT_SENTINEL; | ||||
| node_addr = kernel_tex_fetch(__object_node, object); | node_addr = kernel_tex_fetch(__object_node, object); | ||||
| } | } | ||||
| Show All 21 Lines | #endif | ||||
| node_addr = traversal_stack[stack_ptr]; | node_addr = traversal_stack[stack_ptr]; | ||||
| --stack_ptr; | --stack_ptr; | ||||
| } | } | ||||
| } while (node_addr != ENTRYPOINT_SENTINEL); | } while (node_addr != ENTRYPOINT_SENTINEL); | ||||
| return (isect->prim != PRIM_NONE); | return (isect->prim != PRIM_NONE); | ||||
| } | } | ||||
| ccl_device_inline bool BVH_FUNCTION_NAME(KernelGlobals *kg, | ccl_device_inline bool BVH_FUNCTION_NAME(const KernelGlobals *kg, | ||||
| const Ray *ray, | const Ray *ray, | ||||
| Intersection *isect, | Intersection *isect, | ||||
| const uint visibility) | const uint visibility) | ||||
| { | { | ||||
| return BVH_FUNCTION_FULL_NAME(BVH)(kg, ray, isect, visibility); | return BVH_FUNCTION_FULL_NAME(BVH)(kg, ray, isect, visibility); | ||||
| } | } | ||||
| #undef BVH_FUNCTION_NAME | #undef BVH_FUNCTION_NAME | ||||
| #undef BVH_FUNCTION_FEATURES | #undef BVH_FUNCTION_FEATURES | ||||
| #undef NODE_INTERSECT | #undef NODE_INTERSECT | ||||