GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build NvCloth for Windows on ARM

Browse Source
This commit is contained in:
Ari Vuollet
2024-05-09 20:25:16 +03:00
parent a5566d297f
commit 84f7fde753
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/ThirdParty/NvCloth/ps/PsMathUtils.h vendored
View File

@@ -313,7 +313,7 @@ PX_FORCE_INLINE physx::PxI32 rand(const physx::PxI32 a, const physx::PxI32 b)
*/ */
PX_FORCE_INLINE physx::PxF32 rand(const physx::PxF32 a, const physx::PxF32 b) PX_FORCE_INLINE physx::PxF32 rand(const physx::PxF32 a, const physx::PxF32 b)
{ {
return a + (b - a) * ::rand() / RAND_MAX; return a + (b - a) * ::rand() / (physx::PxF32)RAND_MAX;
} }
//! \brief return angle between two vectors in radians //! \brief return angle between two vectors in radians

2
Source/ThirdParty/NvCloth/ps/windows/PsWindowsIntrinsics.h vendored
View File

@@ -118,7 +118,7 @@ PX_FORCE_INLINE uint32_t PxCountLeadingZeros(uint32_t v)
/*! /*!
Prefetch aligned cache size around \c ptr+offset. Prefetch aligned cache size around \c ptr+offset.
*/ */
#if !PX_ARM #if !PX_ARM && !PX_A64
PX_FORCE_INLINE void PxPrefetchLine(const void* ptr, uint32_t offset = 0) PX_FORCE_INLINE void PxPrefetchLine(const void* ptr, uint32_t offset = 0)
{ {
// cache line on X86/X64 is 64-bytes so a 128-byte prefetch would require 2 prefetches. // cache line on X86/X64 is 64-bytes so a 128-byte prefetch would require 2 prefetches.

3
Source/Tools/Flax.Build/Deps/Dependencies/NvCloth.cs
View File

@@ -65,6 +65,7 @@ namespace Flax.Deps.Dependencies
{ {
case TargetPlatform.Windows: case TargetPlatform.Windows:
Build(options, platform, TargetArchitecture.x64); Build(options, platform, TargetArchitecture.x64);
Build(options, platform, TargetArchitecture.ARM64);
break; break;
case TargetPlatform.XboxOne: case TargetPlatform.XboxOne:
case TargetPlatform.XboxScarlett: case TargetPlatform.XboxScarlett:
@@ -193,7 +194,7 @@ namespace Flax.Deps.Dependencies
RunCmake(cmakeFolder, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + cmakeArgs, envVars); RunCmake(cmakeFolder, platform, architecture, " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF " + cmakeArgs, envVars);
// Run build // Run build
Utilities.Run("cmake", "--build . --config Release", null, cmakeFolder, Utilities.RunOptions.ThrowExceptionOnError, envVars); BuildCmake(cmakeFolder, envVars);
// Deploy binaries // Deploy binaries
var libs = new[] var libs = new[]