diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-09-10 16:27:22 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-09-10 16:27:22 +0300 |
| commit | 7a89fa4a8550a7b3020bd762ab8b69ec836e2f6b (patch) | |
| tree | 810f18b8595ccf8b9a02d188da35f0a53f6a7174 | |
| parent | 71f0f05cd52ef94575900958ce32de8e2b4a0eeb (diff) | |
Cycles: Fixed some warnings.
| -rw-r--r-- | intern/cycles/bvh/bvh_embree.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh.h | 8 | ||||
| -rw-r--r-- | intern/cycles/kernel/bvh/bvh_embree.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/bvh/bvh_embree.cpp b/intern/cycles/bvh/bvh_embree.cpp index 2122d09ec7e..82859f3c881 100644 --- a/intern/cycles/bvh/bvh_embree.cpp +++ b/intern/cycles/bvh/bvh_embree.cpp @@ -246,8 +246,8 @@ bool rtc_memory_monitor_func(void* userPtr, const ssize_t bytes, const bool) return true; } - -void rtc_error_func(void*, enum RTCError code, const char* str) +void rtc_error_func(void*, enum RTCError code, const char* str); +void rtc_error_func(void*, enum RTCError, const char* str) { VLOG(0) << str; } diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h index 40faeb1037b..36e7e1c3204 100644 --- a/intern/cycles/kernel/bvh/bvh.h +++ b/intern/cycles/kernel/bvh/bvh.h @@ -176,7 +176,7 @@ ccl_device_intersect bool scene_intersect(KernelGlobals *kg, #ifdef __EMBREE__ if(kernel_data.bvh.scene) { isect->t = ray.t; - CCLIntersectContext ctx(ray, kg, CCLIntersectContext::RAY_REGULAR); + CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_REGULAR); IntersectContext rtc_ctx(&ctx); RTCRayHit ray_hit; kernel_embree_setup_rayhit(ray, ray_hit, visibility); @@ -234,7 +234,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg, { #ifdef __EMBREE__ if(kernel_data.bvh.scene) { - CCLIntersectContext ctx(ray, kg, CCLIntersectContext::RAY_SSS); + CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_SSS); ctx.lcg_state = lcg_state; ctx.max_hits = max_hits; ctx.ss_isect = local_isect; @@ -310,7 +310,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg, { # ifdef __EMBREE__ if(kernel_data.bvh.scene) { - CCLIntersectContext ctx(*ray, kg, CCLIntersectContext::RAY_SHADOW_ALL); + CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_SHADOW_ALL); ctx.isect_s = isect; ctx.max_hits = max_hits; ctx.num_hits = 0; @@ -415,7 +415,7 @@ ccl_device_intersect uint scene_intersect_volume_all(KernelGlobals *kg, { # ifdef __EMBREE__ if(kernel_data.bvh.scene) { - CCLIntersectContext ctx(*ray, kg, CCLIntersectContext::RAY_VOLUME_ALL); + CCLIntersectContext ctx(kg, CCLIntersectContext::RAY_VOLUME_ALL); ctx.isect_s = isect; ctx.max_hits = max_hits; ctx.num_hits = 0; diff --git a/intern/cycles/kernel/bvh/bvh_embree.h b/intern/cycles/kernel/bvh/bvh_embree.h index 94bd5dab991..23895a561c4 100644 --- a/intern/cycles/kernel/bvh/bvh_embree.h +++ b/intern/cycles/kernel/bvh/bvh_embree.h @@ -46,7 +46,7 @@ struct CCLIntersectContext { int sss_object_id; uint *lcg_state; - CCLIntersectContext(const Ray& ray, KernelGlobals *kg_, RayType type_) + CCLIntersectContext(KernelGlobals *kg_, RayType type_) { kg = kg_; type = type_; |