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.

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

Fix embree4 bitrot #433

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/continuous-building.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ jobs:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
- macos-12
- windows-2022
use-asan:
Expand Down
8 changes: 4 additions & 4 deletions include/light/trace_embree.hh
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ public:

#ifdef HAVE_EMBREE4
RTCIntersectArguments embree4_args = ctx2.setup_intersection_arguments();
for (int i = 0; i < _numrays; ++i)
rtcIntersect1(scene, &_rays[i], &embree4_args);
for (auto &ray : _rays)
rtcIntersect1(scene, &ray.ray, &embree4_args);
#else
rtcIntersect1M(scene, &ctx2, &_rays.data()->ray, _rays.size(), sizeof(_rays[0]));
#endif
Expand Down Expand Up @@ -310,8 +310,8 @@ public:
ray_source_info ctx2(this, self, shadowmask);
#ifdef HAVE_EMBREE4
RTCOccludedArguments embree4_args = ctx2.setup_occluded_arguments();
for (int i = 0; i < _numrays; ++i)
rtcOccluded1(scene, &_rays[i], &embree4_args);
for (auto &ray : _rays)
rtcOccluded1(scene, &ray.ray.ray, &embree4_args);
#else
rtcOccluded1M(scene, &ctx2, &_rays.data()->ray.ray, _rays.size(), sizeof(_rays[0]));
#endif
Expand Down
Loading