diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-22 09:55:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 09:55:57 +0200 |
| commit | 3573d5f4ae9bddd063a6b74c9be9b44cd2780708 (patch) | |
| tree | c8106f7eb53be84232905fb48f8d5be32aa39aaf | |
| parent | a6979e7c66c366ad521fc3d8cbd81d911650f030 (diff) | |
| parent | 04410346bb15c49619f54ed439eff10c31b8c70d (diff) | |
Merge pull request #21281 from elasota/fix-squish-sse
Fix Squish SSE misconfiguration
| -rw-r--r-- | modules/squish/image_compress_squish.cpp | 6 | ||||
| -rw-r--r-- | thirdparty/squish/config.h | 20 |
2 files changed, 20 insertions, 6 deletions
diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index f6be537413..6aaabb9d9b 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -32,12 +32,6 @@ #include "print_string.h" -#if defined(__SSE2__) -#define SQUISH_USE_SSE 2 -#elif defined(__SSE__) -#define SQUISH_USE_SSE 1 -#endif - #include <squish.h> void image_decompress_squish(Image *p_image) { diff --git a/thirdparty/squish/config.h b/thirdparty/squish/config.h index 92edefe966..05f8d72598 100644 --- a/thirdparty/squish/config.h +++ b/thirdparty/squish/config.h @@ -32,6 +32,26 @@ #endif // Set to 1 or 2 when building squish to use SSE or SSE2 instructions. +// -- GODOT start -- +#ifdef _MSC_VER + #if defined(_M_IX86_FP) + #if _M_IX86_FP >= 2 + #define SQUISH_USE_SSE 2 + #elif _M_IX86_FP >= 1 + #define SQUISH_USE_SSE 1 + #endif + #elif defined(_M_X64) + #define SQUISH_USE_SSE 2 + #endif +#else + #if defined(__SSE2__) + #define SQUISH_USE_SSE 2 + #elif defined(__SSE__) + #define SQUISH_USE_SSE 1 + #endif +#endif +// -- GODOT end -- + #ifndef SQUISH_USE_SSE #define SQUISH_USE_SSE 0 #endif |