Merge pull request #91684 from Chubercik/embree4_aftermath

Fix `builtin_embree=no` build linking the wrong version of Embree
godotengine · May 8, 2024 · 17a8126 · 17a8126
2 parents 4c30718 + 7699d67
commit 17a8126
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/math/static_raycaster.h b/core/math/static_raycaster.h
@@ -49,7 +49,7 @@ class StaticRaycaster : public RefCounted {
 	static StaticRaycaster *(*create_function)();
 
 public:
-	// compatible with embree3 rays
+	// Compatible with embree4 rays.
 	struct __aligned(16) Ray {
 		const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h
 

diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
@@ -309,7 +309,7 @@ def configure(env: "SConsEnvironment"):
 
     if not env["builtin_embree"] and env["arch"] in ["x86_64", "arm64"]:
         # No pkgconfig file so far, hardcode expected lib name.
-        env.Append(LIBS=["embree3"])
+        env.Append(LIBS=["embree4"])
 
     if not env["builtin_openxr"]:
         env.ParseConfig("pkg-config openxr --cflags --libs")

diff --git a/scene/3d/lightmapper.h b/scene/3d/lightmapper.h
@@ -61,7 +61,7 @@ class LightmapRaycaster : public RefCounted {
 	static LightmapRaycaster *(*create_function)();
 
 public:
-	// compatible with embree3 rays
+	// Compatible with embree4 rays.
 	struct __aligned(16) Ray {
 		const static unsigned int INVALID_GEOMETRY_ID = ((unsigned int)-1); // from rtcore_common.h