|
 |
f6e9903 |
diff -ru embree-2.13.0-orig/kernels/common/accel.cpp embree-2.13.0/kernels/common/accel.cpp
|
|
|
f6e9903 |
--- embree-2.13.0-orig/kernels/common/accel.cpp 2016-11-21 01:12:33.000000000 -0800
|
|
|
f6e9903 |
+++ embree-2.13.0/kernels/common/accel.cpp 2017-01-28 20:47:13.979363972 -0800
|
|
|
f6e9903 |
@@ -54,4 +54,13 @@
|
|
|
f6e9903 |
|
|
|
f6e9903 |
Accel::IntersectorN::IntersectorN (IntersectFuncN intersect, OccludedFuncN occluded, const char* name)
|
|
|
f6e9903 |
: intersect(intersect), occluded(occluded), name(name) {}
|
|
|
f6e9903 |
+
|
|
|
f6e9903 |
+ RayStreamFilterFuncs::RayStreamFilterFuncs()
|
|
|
f6e9903 |
+ : filterAOS(nullptr), filterSOA(nullptr), filterSOP(nullptr) {}
|
|
|
f6e9903 |
+
|
|
|
f6e9903 |
+ RayStreamFilterFuncs::RayStreamFilterFuncs(void (*ptr) ())
|
|
|
f6e9903 |
+ : filterAOS((filterAOS_func) ptr), filterSOA((filterSOA_func) ptr), filterSOP((filterSOP_func) ptr) {}
|
|
|
f6e9903 |
+
|
|
|
f6e9903 |
+ RayStreamFilterFuncs::RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop)
|
|
|
f6e9903 |
+ : filterAOS(aos), filterAOP(aop), filterSOA(soa), filterSOP(sop) {}
|
|
|
f6e9903 |
}
|
|
|
f6e9903 |
diff -ru embree-2.13.0-orig/kernels/common/accel.h embree-2.13.0/kernels/common/accel.h
|
|
|
f6e9903 |
--- embree-2.13.0-orig/kernels/common/accel.h 2016-11-21 01:12:33.000000000 -0800
|
|
|
f6e9903 |
+++ embree-2.13.0/kernels/common/accel.h 2017-01-28 20:49:01.041013824 -0800
|
|
|
f6e9903 |
@@ -454,15 +454,9 @@
|
|
|
f6e9903 |
|
|
|
f6e9903 |
struct RayStreamFilterFuncs
|
|
|
f6e9903 |
{
|
|
|
f6e9903 |
- __forceinline RayStreamFilterFuncs()
|
|
|
f6e9903 |
- : filterAOS(nullptr), filterSOA(nullptr), filterSOP(nullptr) {}
|
|
|
f6e9903 |
-
|
|
|
f6e9903 |
- __forceinline RayStreamFilterFuncs(void (*ptr) ())
|
|
|
f6e9903 |
- : filterAOS((filterAOS_func) ptr), filterSOA((filterSOA_func) ptr), filterSOP((filterSOP_func) ptr) {}
|
|
|
f6e9903 |
-
|
|
|
f6e9903 |
- __forceinline RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop)
|
|
|
f6e9903 |
- : filterAOS(aos), filterAOP(aop), filterSOA(soa), filterSOP(sop) {}
|
|
|
f6e9903 |
-
|
|
|
f6e9903 |
+ RayStreamFilterFuncs();
|
|
|
f6e9903 |
+ RayStreamFilterFuncs(void (*ptr) ());
|
|
|
f6e9903 |
+ RayStreamFilterFuncs(filterAOS_func aos, filterAOP_func aop, filterSOA_func soa, filterSOP_func sop);
|
|
|
f6e9903 |
public:
|
|
|
f6e9903 |
filterAOS_func filterAOS;
|
|
|
f6e9903 |
filterAOP_func filterAOP;
|