forked from bartvdbraak/blender
Cycles; Code cleanup, make it more obvious what #endif belongs to
This commit is contained in:
parent
144096faad
commit
a888b8beaf
@ -314,7 +314,7 @@ ccl_device bool BVH_FUNCTION_NAME
|
|||||||
nodeAddr = kernel_tex_fetch(__object_node, object);
|
nodeAddr = kernel_tex_fetch(__object_node, object);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
#if FEATURE(BVH_INSTANCING)
|
#if FEATURE(BVH_INSTANCING)
|
||||||
@ -360,7 +360,7 @@ ccl_device bool BVH_FUNCTION_NAME
|
|||||||
nodeAddr = traversalStack[stackPtr];
|
nodeAddr = traversalStack[stackPtr];
|
||||||
--stackPtr;
|
--stackPtr;
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -251,7 +251,7 @@ ccl_device uint BVH_FUNCTION_NAME(KernelGlobals *kg, const Ray *ray, Intersectio
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
#if FEATURE(BVH_INSTANCING)
|
#if FEATURE(BVH_INSTANCING)
|
||||||
@ -279,7 +279,7 @@ ccl_device uint BVH_FUNCTION_NAME(KernelGlobals *kg, const Ray *ray, Intersectio
|
|||||||
nodeAddr = traversalStack[stackPtr];
|
nodeAddr = traversalStack[stackPtr];
|
||||||
--stackPtr;
|
--stackPtr;
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
return num_hits;
|
return num_hits;
|
||||||
|
@ -329,7 +329,7 @@ ccl_device bool BVH_FUNCTION_NAME
|
|||||||
nodeAddr = kernel_tex_fetch(__object_node, object);
|
nodeAddr = kernel_tex_fetch(__object_node, object);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
#if FEATURE(BVH_INSTANCING)
|
#if FEATURE(BVH_INSTANCING)
|
||||||
@ -357,7 +357,7 @@ ccl_device bool BVH_FUNCTION_NAME
|
|||||||
nodeAddr = traversalStack[stackPtr];
|
nodeAddr = traversalStack[stackPtr];
|
||||||
--stackPtr;
|
--stackPtr;
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
return (isect->prim != PRIM_NONE);
|
return (isect->prim != PRIM_NONE);
|
||||||
|
@ -271,7 +271,7 @@ ccl_device bool BVH_FUNCTION_NAME(KernelGlobals *kg,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_INSTANCING) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
#if FEATURE(BVH_INSTANCING)
|
#if FEATURE(BVH_INSTANCING)
|
||||||
@ -299,7 +299,7 @@ ccl_device bool BVH_FUNCTION_NAME(KernelGlobals *kg,
|
|||||||
nodeAddr = traversalStack[stackPtr];
|
nodeAddr = traversalStack[stackPtr];
|
||||||
--stackPtr;
|
--stackPtr;
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FEATURE(BVH_MOTION) */
|
||||||
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
} while(nodeAddr != ENTRYPOINT_SENTINEL);
|
||||||
|
|
||||||
return (isect->prim != PRIM_NONE);
|
return (isect->prim != PRIM_NONE);
|
||||||
|
Loading…
Reference in New Issue
Block a user