godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #91684 from Chubercik/embree4_aftermath 

Fix `builtin_embree=no` build linking the wrong version of Embree
This commit is contained in:
Rémi Verschelde 2024-05-08 09:54:24 +02:00
parent 4c30718102 7699d678c4
commit 17a81260cb
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/math/static_raycaster.h
View File

@ -49,7 +49,7 @@ protected:
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

2
platform/linuxbsd/detect.py
View File

@ -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")

2
scene/3d/lightmapper.h
View File

@ -61,7 +61,7 @@ protected:
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