Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +53 -46
1 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b97a6daa9a - Show all commits

99
intern/cycles/kernel/device/cpu/bvh.h
View File

@ -112,31 +112,17 @@ ccl_device_inline void kernel_embree_setup_rayhit(const Ray &ray,
ccl_device_inline bool kernel_embree_is_self_intersection(const KernelGlobals kg, ccl_device_inline bool kernel_embree_is_self_intersection(const KernelGlobals kg,
const RTCHit *hit, const RTCHit *hit,
const Ray *ray) const Ray *ray,
const intptr_t prim_offset)
{ {
int object, prim; int object, prim;
object = (hit->instID[0] != RTC_INVALID_GEOMETRY_ID ? hit->instID[0] : hit->geomID) / 2;
if (hit->instID[0] != RTC_INVALID_GEOMETRY_ID) { if ((ray->self.object == object) || (ray->self.light_object == object)) {
object = hit->instID[0] / 2; prim = hit->primID + prim_offset;
if ((ray->self.object == object) || (ray->self.light_object == object)) {
RTCScene inst_scene = (RTCScene)rtcGetGeometryUserData(
rtcGetGeometry(kernel_data.device_bvh, hit->instID[0]));
prim = hit->primID +
(intptr_t)rtcGetGeometryUserData(rtcGetGeometry(inst_scene, hit->geomID));
}
else {
return false;
}
} }
else { else {
object = hit->geomID / 2; return false;
if ((ray->self.object == object) || (ray->self.light_object == object)) {
prim = hit->primID +
(intptr_t)rtcGetGeometryUserData(rtcGetGeometry(kernel_data.device_bvh, hit->geomID));
}
else {
return false;
}
} }
const bool is_hair = hit->geomID & 1; const bool is_hair = hit->geomID & 1;
@ -150,21 +136,12 @@ ccl_device_inline bool kernel_embree_is_self_intersection(const KernelGlobals kg
ccl_device_inline void kernel_embree_convert_hit(KernelGlobals kg, ccl_device_inline void kernel_embree_convert_hit(KernelGlobals kg,
const RTCRay *ray, const RTCRay *ray,
const RTCHit *hit, const RTCHit *hit,
Intersection *isect) Intersection *isect,
const intptr_t prim_offset)
{ {
isect->t = ray->tfar; isect->t = ray->tfar;
if (hit->instID[0] != RTC_INVALID_GEOMETRY_ID) { isect->prim = hit->primID + prim_offset;
RTCScene inst_scene = (RTCScene)rtcGetGeometryUserData( isect->object = hit->instID[0] != RTC_INVALID_GEOMETRY_ID ? hit->instID[0] / 2 : hit->geomID / 2;
rtcGetGeometry(kernel_data.device_bvh, hit->instID[0]));
isect->prim = hit->primID +
(intptr_t)rtcGetGeometryUserData(rtcGetGeometry(inst_scene, hit->geomID));
isect->object = hit->instID[0] / 2;
}
else {
isect->prim = hit->primID + (intptr_t)rtcGetGeometryUserData(
rtcGetGeometry(kernel_data.device_bvh, hit->geomID));
isect->object = hit->geomID / 2;
}
const bool is_hair = hit->geomID & 1; const bool is_hair = hit->geomID & 1;
if (is_hair) { if (is_hair) {
@ -181,16 +158,35 @@ ccl_device_inline void kernel_embree_convert_hit(KernelGlobals kg,
} }
} }
ccl_device_inline void kernel_embree_convert_sss_hit( ccl_device_inline void kernel_embree_convert_hit(KernelGlobals kg,
KernelGlobals kg, const RTCRay *ray, const RTCHit *hit, Intersection *isect, int object) const RTCRay *ray,
const RTCHit *hit,
Intersection *isect)
{
intptr_t prim_offset;
if (hit->instID[0] != RTC_INVALID_GEOMETRY_ID) {
RTCScene inst_scene = (RTCScene)rtcGetGeometryUserData(
rtcGetGeometry(kernel_data.device_bvh, hit->instID[0]));
prim_offset = intptr_t(rtcGetGeometryUserData(rtcGetGeometry(inst_scene, hit->geomID)));
}
else {
prim_offset = intptr_t(
rtcGetGeometryUserData(rtcGetGeometry(kernel_data.device_bvh, hit->geomID)));
}
kernel_embree_convert_hit(kg, ray, hit, isect, prim_offset);
}
ccl_device_inline void kernel_embree_convert_sss_hit(KernelGlobals kg,
const RTCRay *ray,
const RTCHit *hit,
Intersection *isect,
int object,
const intptr_t prim_offset)
{ {
isect->u = hit->u; isect->u = hit->u;
isect->v = hit->v; isect->v = hit->v;
isect->t = ray->tfar; isect->t = ray->tfar;
RTCScene inst_scene = (RTCScene)rtcGetGeometryUserData( isect->prim = hit->primID + prim_offset;
rtcGetGeometry(kernel_data.device_bvh, object * 2));
isect->prim = hit->primID +
(intptr_t)rtcGetGeometryUserData(rtcGetGeometry(inst_scene, hit->geomID));
isect->object = object; isect->object = object;
isect->type = kernel_data_fetch(objects, object).primitive_type; isect->type = kernel_data_fetch(objects, object).primitive_type;
} }
@ -211,7 +207,8 @@ ccl_device void kernel_embree_filter_intersection_func(const RTCFilterFunctionNA
const KernelGlobalsCPU *kg = ctx->kg; const KernelGlobalsCPU *kg = ctx->kg;
const Ray *cray = ctx->ray; const Ray *cray = ctx->ray;
if (kernel_embree_is_self_intersection(kg, hit, cray)) { if (kernel_embree_is_self_intersection(
kg, hit, cray, reinterpret_cast<intptr_t>(args->geometryUserPtr))) {
*args->valid = 0; *args->valid = 0;
} }
} }
@ -235,7 +232,8 @@ ccl_device void kernel_embree_filter_occluded_func(const RTCFilterFunctionNArgum
switch (ctx->type) { switch (ctx->type) {
case CCLIntersectContext::RAY_SHADOW_ALL: { case CCLIntersectContext::RAY_SHADOW_ALL: {
Intersection current_isect; Intersection current_isect;
kernel_embree_convert_hit(kg, ray, hit, &current_isect); kernel_embree_convert_hit(
kg, ray, hit, &current_isect, reinterpret_cast<intptr_t>(args->geometryUserPtr));
if (intersection_skip_self_shadow(cray->self, current_isect.object, current_isect.prim)) { if (intersection_skip_self_shadow(cray->self, current_isect.object, current_isect.prim)) {
*args->valid = 0; *args->valid = 0;
return; return;
@ -309,10 +307,16 @@ ccl_device void kernel_embree_filter_occluded_func(const RTCFilterFunctionNArgum
/* Check if it's hitting the correct object. */ /* Check if it's hitting the correct object. */
Intersection current_isect; Intersection current_isect;
if (ctx->type == CCLIntersectContext::RAY_SSS) { if (ctx->type == CCLIntersectContext::RAY_SSS) {
kernel_embree_convert_sss_hit(kg, ray, hit, &current_isect, ctx->local_object_id); kernel_embree_convert_sss_hit(kg,
ray,
hit,
&current_isect,
ctx->local_object_id,
reinterpret_cast<intptr_t>(args->geometryUserPtr));
} }
else { else {
kernel_embree_convert_hit(kg, ray, hit, &current_isect); kernel_embree_convert_hit(
kg, ray, hit, &current_isect, reinterpret_cast<intptr_t>(args->geometryUserPtr));
if (ctx->local_object_id != current_isect.object) { if (ctx->local_object_id != current_isect.object) {
/* This tells Embree to continue tracing. */ /* This tells Embree to continue tracing. */
*args->valid = 0; *args->valid = 0;
@ -387,7 +391,8 @@ ccl_device void kernel_embree_filter_occluded_func(const RTCFilterFunctionNArgum
/* Append the intersection to the end of the array. */ /* Append the intersection to the end of the array. */
if (ctx->num_hits < ctx->max_hits) { if (ctx->num_hits < ctx->max_hits) {
Intersection current_isect; Intersection current_isect;
kernel_embree_convert_hit(kg, ray, hit, &current_isect); kernel_embree_convert_hit(
kg, ray, hit, &current_isect, reinterpret_cast<intptr_t>(args->geometryUserPtr));
if (intersection_skip_self(cray->self, current_isect.object, current_isect.prim)) { if (intersection_skip_self(cray->self, current_isect.object, current_isect.prim)) {
*args->valid = 0; *args->valid = 0;
return; return;
@ -409,7 +414,8 @@ ccl_device void kernel_embree_filter_occluded_func(const RTCFilterFunctionNArgum
} }
case CCLIntersectContext::RAY_REGULAR: case CCLIntersectContext::RAY_REGULAR:
default: default:
if (kernel_embree_is_self_intersection(kg, hit, cray)) { if (kernel_embree_is_self_intersection(
kg, hit, cray, reinterpret_cast<intptr_t>(args->geometryUserPtr))) {
*args->valid = 0; *args->valid = 0;
return; return;
} }
@ -433,7 +439,8 @@ ccl_device void kernel_embree_filter_func_backface_cull(const RTCFilterFunctionN
const KernelGlobalsCPU *kg = ctx->kg; const KernelGlobalsCPU *kg = ctx->kg;
const Ray *cray = ctx->ray; const Ray *cray = ctx->ray;
if (kernel_embree_is_self_intersection(kg, hit, cray)) { if (kernel_embree_is_self_intersection(
kg, hit, cray, reinterpret_cast<intptr_t>(args->geometryUserPtr))) {
*args->valid = 0; *args->valid = 0;
} }
} }