Attachment 186751 Details for Bug 222633 – fix compiler errors

fix compiler errors

patch-intern_cycles_bvh_bvh__build.cpp (text/x-c++src), 1.29 KB, created by deep-fx on 2017-09-27 06:19:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: deep-fx

Created: 2017-09-27 06:19:00 UTC

Size: 1.29 KB

patch

obsolete

>--- intern/cycles/bvh/bvh_build.cpp.orig	2017-02-22 15:11:13 UTC
>+++ intern/cycles/bvh/bvh_build.cpp
>@@ -905,12 +905,13 @@ BVHNode* BVHBuild::create_leaf_node(cons
> 	 *    can not control.
> 	 */
> 	typedef StackAllocator<256, int> LeafStackAllocator;
>+	typedef StackAllocator<256, float2> LeafStackAllocatorF2;
> 	typedef StackAllocator<256, BVHReference> LeafReferenceStackAllocator;
> 
> 	vector<int, LeafStackAllocator> p_type[PRIMITIVE_NUM_TOTAL];
> 	vector<int, LeafStackAllocator> p_index[PRIMITIVE_NUM_TOTAL];
> 	vector<int, LeafStackAllocator> p_object[PRIMITIVE_NUM_TOTAL];
>-	vector<float2, LeafStackAllocator> p_time[PRIMITIVE_NUM_TOTAL];
>+	vector<float2, LeafStackAllocatorF2> p_time[PRIMITIVE_NUM_TOTAL];
> 	vector<BVHReference, LeafReferenceStackAllocator> p_ref[PRIMITIVE_NUM_TOTAL];
> 
> 	/* TODO(sergey): In theory we should be able to store references. */
>@@ -964,7 +965,7 @@ BVHNode* BVHBuild::create_leaf_node(cons
> 	vector<int, LeafStackAllocator> local_prim_type,
> 	                                local_prim_index,
> 	                                local_prim_object;
>-	vector<float2, LeafStackAllocator> local_prim_time;
>+	vector<float2, LeafStackAllocatorF2> local_prim_time;
> 	local_prim_type.resize(num_new_prims);
> 	local_prim_index.resize(num_new_prims);
> 	local_prim_object.resize(num_new_prims);

Actions: View

Attachments on bug 222633: 186751