Upgrade to Embree 4.

gonsolo · Mar 9, 2024 · e6623a2 · e6623a2
1 parent f78ba05
commit e6623a2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 15 deletions.
diff --git a/Package.swift b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
                         name: "gonzales",
                         dependencies: [
                                 "SWCompression",
-                                "embree3",
+                                "embree4",
                                 "openImageIOBridge",
                                 "cuda",
                                 "cudaBridge",
@@ -35,7 +35,7 @@ let package = Package(
                         dependencies: ["cuda"],
                         swiftSettings: [.interoperabilityMode(.Cxx)]
                 ),
-                .systemLibrary(name: "embree3"),
+                .systemLibrary(name: "embree4"),
                 .systemLibrary(name: "openimageio", pkgConfig: "OpenImageIO"),
                 .systemLibrary(name: "cuda", pkgConfig: "cuda-12.3"),
                 .systemLibrary(name: "ptex", pkgConfig: "ptex"),

diff --git a/Sources/embree3/embree3.h b/Sources/embree3/embree3.h
diff --git a/Sources/embree3/module.modulemap b/Sources/embree3/module.modulemap
diff --git a/Sources/embree4/embree4.h b/Sources/embree4/embree4.h
@@ -0,0 +1 @@
+#include <embree4/rtcore.h>
diff --git a/Sources/embree4/module.modulemap b/Sources/embree4/module.modulemap
@@ -0,0 +1,5 @@
+module embree4 {
+        umbrella header "embree4.h"
+        link "embree4"
+}
+
diff --git a/Sources/gonzales/Accelerators/Embree.swift b/Sources/gonzales/Accelerators/Embree.swift
@@ -1,5 +1,5 @@
 import Foundation
-import embree3
+import embree4
 
 // swift-format-ignore: AlwaysUseLowerCamelCase
 @_silgen_name("_swift_stdlib_immortalize")
@@ -139,14 +139,11 @@ final class EmbreeAccelerator: EmbreeBase {
                         v: 0,
                         primID: 0,
                         geomID: rtcInvalidGeometryId,
-                        instID: rtcInvalidGeometryId)
+                        instID: rtcInvalidGeometryId,
+                        instPrimID: 0)
 
-                //_unsafePerformance {
                 var rayhit = RTCRayHit(ray: rtcRay, hit: rtcHit)
-                var context = RTCIntersectContext()
-                rtcInitIntersectContext(&context)
-                rtcIntersect1(rtcScene, &context, &rayhit)
-                //}
+                rtcIntersect1(rtcScene, &rayhit, nil)
 
                 guard rayhit.hit.geomID != rtcInvalidGeometryId else {
                         return empty(#line)