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

Merge pull request #55792 from aaronfranke/misc

This commit is contained in:
Rémi Verschelde 2021-12-10 20:45:49 +01:00 committed by GitHub
parent b46ab89675 368c0bc0ac
commit 0fba151446
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux_builds.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
sconsflags: float=64 use_asan=yes use_ubsan=yes sconsflags: float=64 use_asan=yes use_ubsan=yes
proj-test: true proj-test: true
godot-cpp-test: true godot-cpp-test: true
bin: "./bin/godot.linuxbsd.double.tools.64s" bin: "./bin/godot.linuxbsd.double.tools.64.san"
build-mono: false build-mono: false
# Skip 2GiB artifact speeding up action. # Skip 2GiB artifact speeding up action.
artifact: false artifact: false

2
modules/gltf/gltf_document.cpp
View File

@ -4606,7 +4606,7 @@ Error GLTFDocument::_parse_lights(Ref<GLTFState> state) {
light->outer_cone_angle = spot["outerConeAngle"]; light->outer_cone_angle = spot["outerConeAngle"];
ERR_CONTINUE_MSG(light->inner_cone_angle >= light->outer_cone_angle, "The inner angle must be smaller than the outer angle."); ERR_CONTINUE_MSG(light->inner_cone_angle >= light->outer_cone_angle, "The inner angle must be smaller than the outer angle.");
} else if (type != "point" && type != "directional") { } else if (type != "point" && type != "directional") {
ERR_CONTINUE_MSG(ERR_PARSE_ERROR, "Light type is unknown."); ERR_CONTINUE_MSG(true, "Light type is unknown.");
} }
state->lights.push_back(light); state->lights.push_back(light);

2
platform/android/detect.py
View File

@ -152,7 +152,7 @@ def configure(env):
abi_subpath = "i686-linux-android" abi_subpath = "i686-linux-android"
arch_subpath = "x86" arch_subpath = "x86"
env["x86_libtheora_opt_gcc"] = True env["x86_libtheora_opt_gcc"] = True
if env["android_arch"] == "x86_64": elif env["android_arch"] == "x86_64":
if get_platform(env["ndk_platform"]) < 21: if get_platform(env["ndk_platform"]) < 21:
print( print(
"WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting" "WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting"

2
platform/linuxbsd/detect.py
View File

@ -161,7 +161,7 @@ def configure(env):
env.Append(LINKFLAGS=["-ftest-coverage", "-fprofile-arcs"]) env.Append(LINKFLAGS=["-ftest-coverage", "-fprofile-arcs"])
if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"] or env["use_msan"]: if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"] or env["use_msan"]:
env.extra_suffix += "s" env.extra_suffix += ".san"
if env["use_ubsan"]: if env["use_ubsan"]:
env.Append( env.Append(

2
platform/osx/detect.py
View File

@ -124,7 +124,7 @@ def configure(env):
env["AS"] = basecmd + "as" env["AS"] = basecmd + "as"
if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]: if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]:
env.extra_suffix += "s" env.extra_suffix += ".san"
if env["use_ubsan"]: if env["use_ubsan"]:
env.Append( env.Append(

2
platform/windows/detect.py
View File

@ -308,7 +308,7 @@ def configure_msvc(env, manual_msvc_config):
# Sanitizers # Sanitizers
if env["use_asan"]: if env["use_asan"]:
env.extra_suffix += ".s" env.extra_suffix += ".san"
env.Append(LINKFLAGS=["/INFERASANLIBS"]) env.Append(LINKFLAGS=["/INFERASANLIBS"])
env.Append(CCFLAGS=["/fsanitize=address"]) env.Append(CCFLAGS=["/fsanitize=address"])

2
thirdparty/vhacd/0004-fix-uwp-arm-build.patch vendored
View File

@ -9,7 +9,7 @@ index 3999a71521..4c9e0cf7ab 100644
-#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) -#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
+// -- GODOT start -- +// -- GODOT start --
+//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) +//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
+#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) +#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) && (!defined(_M_ARM64))
+// -- GODOT end -- +// -- GODOT end --
#define BT_USE_SSE #define BT_USE_SSE
#include <emmintrin.h> #include <emmintrin.h>

2
thirdparty/vhacd/inc/btScalar.h vendored
View File

@ -74,7 +74,7 @@ inline int32_t btGetVersion()
// -- GODOT start -- // -- GODOT start --
//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) //#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) #if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) && (!defined(_M_ARM64))
// -- GODOT end -- // -- GODOT end --
#define BT_USE_SSE #define BT_USE_SSE
#include <emmintrin.h> #include <emmintrin.h>