diff options
| author | George L. Albany <Megacake1234@gmail.com> | 2024-11-27 21:15:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 21:15:49 +0000 |
| commit | 85d87116e184e7923b8d6804cab2681b61c62d83 (patch) | |
| tree | 55ec5bfa061a5c27272b831e697b78ed1b756a70 /thirdparty/clipper2/patches | |
| parent | b06d20bf39d15ec736d08d4e4fcb32e0c3c1ce1e (diff) | |
| parent | 721f53fde47c2727d99e3ecccdb789a67df36de0 (diff) | |
| download | redot-engine-master.tar.gz | |
Merge commit godotengine/godot@f128f38
Diffstat (limited to 'thirdparty/clipper2/patches')
| -rw-r--r-- | thirdparty/clipper2/patches/clipper2-exceptions.patch | 8 | ||||
| -rw-r--r-- | thirdparty/clipper2/patches/gcc14-warning.patch | 22 | ||||
| -rw-r--r-- | thirdparty/clipper2/patches/llvm-error.patch | 34 |
3 files changed, 38 insertions, 26 deletions
diff --git a/thirdparty/clipper2/patches/clipper2-exceptions.patch b/thirdparty/clipper2/patches/clipper2-exceptions.patch index 0e1c6585fe..44c2b0287a 100644 --- a/thirdparty/clipper2/patches/clipper2-exceptions.patch +++ b/thirdparty/clipper2/patches/clipper2-exceptions.patch @@ -1,9 +1,9 @@ diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h -index b3dddeeaa2..a77cdad5f4 100644 +index 925c04685e..d0d159b949 100644 --- a/thirdparty/clipper2/include/clipper2/clipper.core.h +++ b/thirdparty/clipper2/include/clipper2/clipper.core.h -@@ -21,6 +21,8 @@ - #include <numeric> +@@ -22,6 +22,8 @@ + #include <optional> #include "clipper2/clipper.version.h" +#define CLIPPER2_THROW(exception) std::abort() @@ -11,7 +11,7 @@ index b3dddeeaa2..a77cdad5f4 100644 namespace Clipper2Lib { -@@ -78,18 +80,18 @@ namespace Clipper2Lib +@@ -79,18 +81,18 @@ namespace Clipper2Lib switch (error_code) { case precision_error_i: diff --git a/thirdparty/clipper2/patches/gcc14-warning.patch b/thirdparty/clipper2/patches/gcc14-warning.patch deleted file mode 100644 index a4f06ef37e..0000000000 --- a/thirdparty/clipper2/patches/gcc14-warning.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h -index a77cdad5f4..0de7c3720e 100644 ---- a/thirdparty/clipper2/include/clipper2/clipper.core.h -+++ b/thirdparty/clipper2/include/clipper2/clipper.core.h -@@ -138,7 +138,7 @@ namespace Clipper2Lib - } - - template <typename T2> -- explicit Point<T>(const Point<T2>& p) -+ explicit Point(const Point<T2>& p) - { - Init(p.x, p.y, p.z); - } -@@ -180,7 +180,7 @@ namespace Clipper2Lib - Point(const T2 x_, const T2 y_) { Init(x_, y_); } - - template <typename T2> -- explicit Point<T>(const Point<T2>& p) { Init(p.x, p.y); } -+ explicit Point(const Point<T2>& p) { Init(p.x, p.y); } - - Point operator * (const double scale) const - { diff --git a/thirdparty/clipper2/patches/llvm-error.patch b/thirdparty/clipper2/patches/llvm-error.patch new file mode 100644 index 0000000000..e326d73e83 --- /dev/null +++ b/thirdparty/clipper2/patches/llvm-error.patch @@ -0,0 +1,34 @@ +diff --git a/thirdparty/clipper2/include/clipper2/clipper.core.h b/thirdparty/clipper2/include/clipper2/clipper.core.h +index 67dd731af6..0f69bf2d9f 100644 +--- a/thirdparty/clipper2/include/clipper2/clipper.core.h ++++ b/thirdparty/clipper2/include/clipper2/clipper.core.h +@@ -695,11 +695,13 @@ namespace Clipper2Lib + // returns true if (and only if) a * b == c * d + inline bool ProductsAreEqual(int64_t a, int64_t b, int64_t c, int64_t d) + { +-#if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX +- const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b); +- const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d); +- return ab == cd; +-#else ++// -- GODOT start -- ++// #if (defined(__clang__) || defined(__GNUC__)) && UINTPTR_MAX >= UINT64_MAX ++// const auto ab = static_cast<__int128_t>(a) * static_cast<__int128_t>(b); ++// const auto cd = static_cast<__int128_t>(c) * static_cast<__int128_t>(d); ++// return ab == cd; ++// #else ++// -- GODOT end -- + // nb: unsigned values needed for calculating overflow carry + const auto abs_a = static_cast<uint64_t>(std::abs(a)); + const auto abs_b = static_cast<uint64_t>(std::abs(b)); +@@ -714,7 +716,9 @@ namespace Clipper2Lib + const auto sign_cd = TriSign(c) * TriSign(d); + + return abs_ab == abs_cd && sign_ab == sign_cd; +-#endif ++// -- GODOT start -- ++// #endif ++// -- GODOT end -- + } + + template <typename T> |