mirror of
https://github.com/godotengine/godot
synced 2024-09-04 21:08:27 +00:00
bullet: Fix UWP build by disabling TaskScheduler dynamic loading
Cf. https://github.com/bulletphysics/bullet3/pull/3991
(cherry picked from commit cbe0cff53d
)
This commit is contained in:
parent
a7ba227631
commit
b04b3064ec
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
|
@ -28,7 +28,7 @@ Files extracted from upstream source:
|
|||
- `src/*` apart from CMakeLists.txt and premake4.lua files
|
||||
- `LICENSE.txt`, and `VERSION` as `VERSION.txt`
|
||||
|
||||
Includes a warning fix which should be upstreamed soon (see patch in `patches`).
|
||||
Includes some patches in the `patches` folder which have been sent upstream.
|
||||
|
||||
|
||||
## certs
|
||||
|
|
|
@ -82,6 +82,11 @@ typedef BOOL(WINAPI* Pfn_GetLogicalProcessorInformation)(PSYSTEM_LOGICAL_PROCESS
|
|||
void getProcessorInformation(btProcessorInfo* procInfo)
|
||||
{
|
||||
memset(procInfo, 0, sizeof(*procInfo));
|
||||
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
|
||||
!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
||||
// Can't dlopen libraries on UWP.
|
||||
return;
|
||||
#else
|
||||
Pfn_GetLogicalProcessorInformation getLogicalProcInfo =
|
||||
(Pfn_GetLogicalProcessorInformation)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "GetLogicalProcessorInformation");
|
||||
if (getLogicalProcInfo == NULL)
|
||||
|
@ -160,6 +165,7 @@ void getProcessorInformation(btProcessorInfo* procInfo)
|
|||
}
|
||||
}
|
||||
free(buf);
|
||||
#endif
|
||||
}
|
||||
|
||||
///btThreadSupportWin32 helps to initialize/shutdown libspe2, start/stop SPU tasks and communication
|
||||
|
|
24
thirdparty/bullet/patches/fix-win32-scheduler-uwp.patch
vendored
Normal file
24
thirdparty/bullet/patches/fix-win32-scheduler-uwp.patch
vendored
Normal file
|
@ -0,0 +1,24 @@
|
|||
diff --git a/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp b/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
|
||||
index 922e449cce..5862264a67 100644
|
||||
--- a/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
|
||||
+++ b/thirdparty/bullet/LinearMath/TaskScheduler/btThreadSupportWin32.cpp
|
||||
@@ -82,6 +82,11 @@ typedef BOOL(WINAPI* Pfn_GetLogicalProcessorInformation)(PSYSTEM_LOGICAL_PROCESS
|
||||
void getProcessorInformation(btProcessorInfo* procInfo)
|
||||
{
|
||||
memset(procInfo, 0, sizeof(*procInfo));
|
||||
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) && \
|
||||
+ !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
|
||||
+ // Can't dlopen libraries on UWP.
|
||||
+ return;
|
||||
+#else
|
||||
Pfn_GetLogicalProcessorInformation getLogicalProcInfo =
|
||||
(Pfn_GetLogicalProcessorInformation)GetProcAddress(GetModuleHandle(TEXT("kernel32")), "GetLogicalProcessorInformation");
|
||||
if (getLogicalProcInfo == NULL)
|
||||
@@ -160,6 +165,7 @@ void getProcessorInformation(btProcessorInfo* procInfo)
|
||||
}
|
||||
}
|
||||
free(buf);
|
||||
+#endif
|
||||
}
|
||||
|
||||
///btThreadSupportWin32 helps to initialize/shutdown libspe2, start/stop SPU tasks and communication
|
Loading…
Reference in a new issue