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

Merge pull request #69169 from akien-mga/embree-wasm-win32 

embree: Enable raycast module build for Web and Windows x86_32
This commit is contained in:
Rémi Verschelde 2022-12-05 10:14:25 +01:00
parent 73de09f38e b2373298a2
commit 8ff2ca35c5
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/raycast/SCsub
View File

@ -67,7 +67,7 @@ if env["builtin_embree"]:
env_raycast.AppendUnique(CPPDEFINES=["NDEBUG"]) # No assert() even in debug builds. env_raycast.AppendUnique(CPPDEFINES=["NDEBUG"]) # No assert() even in debug builds.
if not env.msvc: if not env.msvc:
if env["arch"] == "x86_64": if env["arch"] in ["x86_64", "x86_32"]:
env_raycast.Append(CPPFLAGS=["-msse2", "-mxsave"]) env_raycast.Append(CPPFLAGS=["-msse2", "-mxsave"])
if env["platform"] == "windows": if env["platform"] == "windows":
@ -87,10 +87,13 @@ if env["builtin_embree"]:
env_thirdparty.disable_warnings() env_thirdparty.disable_warnings()
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
if env["arch"] == "arm64" or env.msvc: if env["arch"] != "x86_64" or env.msvc:
# Embree needs those, it will automatically use SSE2NEON in ARM # Embree needs those, it will automatically use SSE2NEON in ARM
env_thirdparty.Append(CPPDEFINES=["__SSE2__", "__SSE__"]) env_thirdparty.Append(CPPDEFINES=["__SSE2__", "__SSE__"])
if env["platform"] == "web":
env_thirdparty.Append(CPPFLAGS=["-msimd128"])
if not env.msvc: if not env.msvc:
env_thirdparty.Append( env_thirdparty.Append(
CPPFLAGS=[ CPPFLAGS=[

14
modules/raycast/config.py
View File

@ -1,9 +1,13 @@
def can_build(env, platform): def can_build(env, platform):
# Depends on Embree library, which only supports x86_64 and arm64. # Supported architectures depend on the Embree library.
if platform == "windows": # No ARM32 support planned.
return env["arch"] == "x86_64" # TODO build for Windows on ARM if env["arch"] == "arm32":
return False
return env["arch"] in ["x86_64", "arm64"] # x86_32 only seems supported on Windows for now.
if env["arch"] == "x86_32" and platform != "windows":
return False
# The rest works, even wasm32!
return True
def configure(env): def configure(env):