godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-21 14:57:09 +00:00
Code Releases Wiki Activity

Fix freeze-crash in lightmapper under MinGW-GCC

Browse Source
This commit is contained in:
Pedro J. Estébanez
2021-01-23 05:53:10 +01:00
parent 2d904127d6
commit 0f4c44c9fb
4 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
thirdparty/embree/common/sys/intrinsics.h vendored
View File

@@ -11,12 +11,6 @@
#include <immintrin.h> #include <immintrin.h>
// -- GODOT start --
#if defined(__WIN32__) && defined(__MINGW32__)
#include <unistd.h>
#endif
// -- GODOT end --
#if defined(__BMI__) && defined(__GNUC__) && !defined(__INTEL_COMPILER) #if defined(__BMI__) && defined(__GNUC__) && !defined(__INTEL_COMPILER)
#if !defined(_tzcnt_u32) #if !defined(_tzcnt_u32)
#define _tzcnt_u32 __tzcnt_u32 #define _tzcnt_u32 __tzcnt_u32
@@ -425,16 +419,8 @@ namespace embree
__forceinline void pause_cpu(const size_t N = 8) __forceinline void pause_cpu(const size_t N = 8)
{ {
// -- GODOT start --
for (size_t i=0; i<N; i++) for (size_t i=0; i<N; i++)
#if !(defined(__WIN32__) && defined(__MINGW32__))
// -- GODOT end --
_mm_pause(); _mm_pause();
// -- GODOT start --
#else
__builtin_ia32_pause();
#endif
// -- GODOT end --
} }
/* prefetches */ /* prefetches */

18
thirdparty/embree/common/sys/mutex.h vendored
View File

@@ -47,17 +47,8 @@ namespace embree
{ {
while (flag.load()) while (flag.load())
{ {
// -- GODOT start --
#if !(defined (__WIN32__) && defined (__MINGW32__))
// -- GODOT end --
_mm_pause(); _mm_pause();
_mm_pause(); _mm_pause();
// -- GODOT start --
#else
__builtin_ia32_pause();
__builtin_ia32_pause();
#endif
// -- GODOT end --
} }
bool expected = false; bool expected = false;
@@ -83,17 +74,8 @@ namespace embree
{ {
while(flag.load()) while(flag.load())
{ {
// -- GODOT start --
#if !(defined (__WIN32__) && defined(__MINGW32__))
// -- GODOT end --
_mm_pause(); _mm_pause();
_mm_pause(); _mm_pause();
// -- GODOT start --
#else
__builtin_ia32_pause();
__builtin_ia32_pause();
#endif
// -- GODOT end --
} }
} }

2
thirdparty/embree/common/sys/platform.h vendored
View File

@@ -91,7 +91,7 @@
#define dll_import #define dll_import
#endif #endif
#ifdef __WIN32__ #if defined(__WIN32__) && !defined(__MINGW32__)
#if !defined(__noinline) #if !defined(__noinline)
#define __noinline __declspec(noinline) #define __noinline __declspec(noinline)
#endif #endif

8
thirdparty/embree/common/tasking/taskschedulerinternal.cpp vendored
View File

@@ -361,15 +361,7 @@ namespace embree
if ((loopIndex % LOOP_YIELD_THRESHOLD) == 0) if ((loopIndex % LOOP_YIELD_THRESHOLD) == 0)
yield(); yield();
else else
// -- GODOT start --
#if !defined(__MINGW32__)
// -- GODOT end --
_mm_pause(); _mm_pause();
// -- GODOT start --
#else
__builtin_ia32_pause();
#endif
// -- GODOT end --
loopIndex++; loopIndex++;
#else #else
yield(); yield();