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

Merge pull request #21281 from elasota/fix-squish-sse 

Fix Squish SSE misconfiguration
This commit is contained in:
Rémi Verschelde 2018-08-22 09:55:57 +02:00 committed by GitHub
parent a6979e7c66 04410346bb
commit 3573d5f4ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/squish/image_compress_squish.cpp
View File

@ -32,12 +32,6 @@
#include "print_string.h" #include "print_string.h"
#if defined(__SSE2__)
#define SQUISH_USE_SSE 2
#elif defined(__SSE__)
#define SQUISH_USE_SSE 1
#endif
#include <squish.h> #include <squish.h>
void image_decompress_squish(Image *p_image) { void image_decompress_squish(Image *p_image) {

20
thirdparty/squish/config.h vendored
View File

@ -32,6 +32,26 @@
#endif #endif
// Set to 1 or 2 when building squish to use SSE or SSE2 instructions. // 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 #ifndef SQUISH_USE_SSE
#define SQUISH_USE_SSE 0 #define SQUISH_USE_SSE 0
#endif #endif