Merge pull request #21281 from elasota/fix-squish-sse
Fix Squish SSE misconfiguration
This commit is contained in:
commit
3573d5f4ae
2 changed files with 20 additions and 6 deletions
|
@ -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) {
|
||||
|
|
20
thirdparty/squish/config.h
vendored
20
thirdparty/squish/config.h
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue