Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing verify / Fixing EMBREE_RAY_PACKETS=OFF #275

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixing verify / Fixing EMBREE_RAY_PACKETS=OFF #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf511b8
Fix SSE2.update and further verify tests with EMBREE_RAY_PACKETS=OFF
maikschulze Mar 1, 2020
9420298
Fix immediate fail of 'SSE2.ray_masks' verify test.
maikschulze Mar 1, 2020
5a6ebd8
Fix SphereFilterMultiHitTest by setting inactive mask in order to not…
maikschulze Mar 1, 2020
128ed96
Fix the failure of the RayMasksTest which has accessed unwritten 'hit…
maikschulze Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 16 additions & 16 deletions kernels/common/rtcore.cpp
View file
Open in desktop
Expand Up @@ -481,12 +481,12 @@ RTC_NAMESPACE_BEGIN;

IntersectContext context(scene,user_context);
#if !defined(EMBREE_RAY_PACKETS)
Ray4* ray4 = (Ray4*) rayhit;
RayHit4* rayhit4 = (RayHit4*)rayhit;
for (size_t i=0; i<4; i++) {
if (!valid[i]) continue;
RayHit ray1; ray4->get(i,ray1);
RayHit ray1; rayhit4->get(i,ray1);
scene->intersectors.intersect((RTCRayHit&)ray1,&context);
ray4->set(i,ray1);
rayhit4->set(i,ray1);
}
#else
scene->intersectors.intersect4(valid,*rayhit,&context);
Expand All @@ -512,12 +512,12 @@ RTC_NAMESPACE_BEGIN;

IntersectContext context(scene,user_context);
#if !defined(EMBREE_RAY_PACKETS)
Ray8* ray8 = (Ray8*) rayhit;
RayHit8* rayhit8 = (RayHit8*) rayhit;
for (size_t i=0; i<8; i++) {
if (!valid[i]) continue;
RayHit ray1; ray8->get(i,ray1);
RayHit ray1; rayhit8->get(i,ray1);
scene->intersectors.intersect((RTCRayHit&)ray1,&context);
ray8->set(i,ray1);
rayhit8->set(i,ray1);
}
#else
if (likely(scene->intersectors.intersector8))
Expand Down Expand Up @@ -545,12 +545,12 @@ RTC_NAMESPACE_BEGIN;

IntersectContext context(scene,user_context);
#if !defined(EMBREE_RAY_PACKETS)
Ray16* ray16 = (Ray16*) rayhit;
RayHit16* rayhit16 = (RayHit16*) rayhit;
for (size_t i=0; i<16; i++) {
if (!valid[i]) continue;
RayHit ray1; ray16->get(i,ray1);
RayHit ray1; rayhit16->get(i,ray1);
scene->intersectors.intersect((RTCRayHit&)ray1,&context);
ray16->set(i,ray1);
rayhit16->set(i,ray1);
}
#else
if (likely(scene->intersectors.intersector16))
Expand Down Expand Up @@ -732,12 +732,12 @@ RTC_NAMESPACE_BEGIN;

IntersectContext context(scene,user_context);
#if !defined(EMBREE_RAY_PACKETS)
RayHit4* ray4 = (RayHit4*) ray;
Ray4* ray4 = (Ray4*) ray;
for (size_t i=0; i<4; i++) {
if (!valid[i]) continue;
RayHit ray1; ray4->get(i,ray1);
Ray ray1; ray4->get(i,ray1);
scene->intersectors.occluded((RTCRay&)ray1,&context);
ray4->geomID[i] = ray1.geomID;
ray4->set(i,ray1);
}
#else
scene->intersectors.occluded4(valid,*ray,&context);
Expand All @@ -763,10 +763,10 @@ RTC_NAMESPACE_BEGIN;

IntersectContext context(scene,user_context);
#if !defined(EMBREE_RAY_PACKETS)
RayHit8* ray8 = (RayHit8*) ray;
Ray8* ray8 = (Ray8*) ray;
for (size_t i=0; i<8; i++) {
if (!valid[i]) continue;
RayHit ray1; ray8->get(i,ray1);
Ray ray1; ray8->get(i,ray1);
scene->intersectors.occluded((RTCRay&)ray1,&context);
ray8->set(i,ray1);
}
Expand Down Expand Up @@ -797,10 +797,10 @@ RTC_NAMESPACE_BEGIN;

IntersectContext context(scene,user_context);
#if !defined(EMBREE_RAY_PACKETS)
RayHit16* ray16 = (RayHit16*) ray;
Ray16* ray16 = (Ray16*) ray;
for (size_t i=0; i<16; i++) {
if (!valid[i]) continue;
RayHit ray1; ray16->get(i,ray1);
Ray ray1; ray16->get(i,ray1);
scene->intersectors.occluded((RTCRay&)ray1,&context);
ray16->set(i,ray1);
}
Expand Down
29 changes: 26 additions & 3 deletions tutorials/verify/verify.cpp
View file
Open in desktop
Expand Up @@ -2544,6 +2544,10 @@ namespace embree
rtcSetGeometryMask(hgeom1,2);
rtcSetGeometryMask(hgeom2,4);
rtcSetGeometryMask(hgeom3,8);
rtcCommitGeometry(hgeom0);
rtcCommitGeometry(hgeom1);
rtcCommitGeometry(hgeom2);
rtcCommitGeometry(hgeom3);
rtcCommitScene (scene);
AssertNoError(device);

Expand All @@ -2560,8 +2564,27 @@ namespace embree
RTCRayHit ray3 = makeRay(pos3+Vec3fa(0,10,0),Vec3fa(0,-1,0)); ray3.ray.mask = mask3;
RTCRayHit rays[4] = { ray0, ray1, ray2, ray3 };
IntersectWithMode(imode,ivariant,scene,rays,4);
for (size_t j=0; j<4; j++)
passed &= masks[j] & (1<<j) ? rays[j].hit.geomID != RTC_INVALID_GEOMETRY_ID : rays[j].hit.geomID == RTC_INVALID_GEOMETRY_ID;

switch (ivariant & VARIANT_INTERSECT_OCCLUDED_MASK)
{
case VARIANT_INTERSECT:
case VARIANT_INTERSECT_OCCLUDED:
{
for (size_t j = 0; j < 4; j++)
passed &= masks[j] & (1 << j) ? rays[j].hit.geomID != RTC_INVALID_GEOMETRY_ID : rays[j].hit.geomID == RTC_INVALID_GEOMETRY_ID;
break;
}
case VARIANT_OCCLUDED:
{
// There's not much we can verify here. 'hit' information is only available when calling rtcIntersect, not on rtcOccluded.
// We can only identify that something was hit by testing rays[j].ray.tfar == -inf.
break;
}
default:
{
assert(false);
}
}
}
AssertNoError(device);

Expand Down Expand Up @@ -3962,7 +3985,7 @@ namespace embree
rayHit.ray.dir_z = 1;
rayHit.ray.tnear = 0;
rayHit.ray.tfar = 100000;
rayHit.ray.mask = 0u;
rayHit.ray.mask = -1;
rayHit.ray.flags = 0u;
rayHit.hit.geomID = RTC_INVALID_GEOMETRY_ID;
rayHit.hit.instID[0] = RTC_INVALID_GEOMETRY_ID;
Expand Down