diff options
author | Brecht Van Lommel <brecht@blender.org> | 2021-02-14 17:34:23 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2021-02-17 18:26:24 +0300 |
commit | 8119f0aad21c3ce88e82d68ed20cd5a8edc99703 (patch) | |
tree | 38c117be872788f9858c09b96b63af6c666fe770 /intern/cycles/bvh | |
parent | db28411fd90b77035dddc1682bb2786da34f73e9 (diff) |
Cycles: refactor intrinsic functions implementation
* Add processor independent fallbacks
* Use uint32_t and uint64_t types
* Remove unused functions
* Better comments and less indentation
Ref D8237, T78710
Diffstat (limited to 'intern/cycles/bvh')
-rw-r--r-- | intern/cycles/bvh/bvh.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/bvh/bvh_build.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/bvh/bvh.cpp b/intern/cycles/bvh/bvh.cpp index 256382e63ba..050e090bddf 100644 --- a/intern/cycles/bvh/bvh.cpp +++ b/intern/cycles/bvh/bvh.cpp @@ -69,7 +69,7 @@ BVHLayout BVHParams::best_bvh_layout(BVHLayout requested_layout, BVHLayoutMask s allowed_layouts_mask = supported_layouts; } /* We get widest from allowed ones and convert mask to actual layout. */ - const BVHLayoutMask widest_allowed_layout_mask = __bsr(allowed_layouts_mask); + const BVHLayoutMask widest_allowed_layout_mask = __bsr((uint32_t)allowed_layouts_mask); return (BVHLayout)(1 << widest_allowed_layout_mask); } diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp index 296f9130f43..ec85cef0851 100644 --- a/intern/cycles/bvh/bvh_build.cpp +++ b/intern/cycles/bvh/bvh_build.cpp @@ -851,7 +851,7 @@ BVHNode *BVHBuild::create_leaf_node(const BVHRange &range, const vector<BVHRefer for (int i = 0; i < range.size(); i++) { const BVHReference &ref = references[range.start() + i]; if (ref.prim_index() != -1) { - int type_index = bitscan(ref.prim_type() & PRIMITIVE_ALL); + uint32_t type_index = bitscan((uint32_t)(ref.prim_type() & PRIMITIVE_ALL)); p_ref[type_index].push_back(ref); p_type[type_index].push_back(ref.prim_type()); p_index[type_index].push_back(ref.prim_index()); |