--- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxIntrinsics.h @@ -34,7 +34,7 @@ #if PX_WINDOWS_FAMILY #include "foundation/windows/PxWindowsIntrinsics.h" -#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4) +#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 || PX_SOLARIS) #include "foundation/unix/PxUnixIntrinsics.h" #elif PX_XBOXONE #include "foundation/XboxOne/PxXboxOneIntrinsics.h" --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/PxPreprocessor.h @@ -105,6 +105,8 @@ #define PX_PS4 1 #elif defined(__NX__) #define PX_SWITCH 1 +#elif defined(__sun) +#define PX_SOLARIS 1 #else #error "Unknown operating system" #endif @@ -197,6 +199,9 @@ #ifndef PX_SWITCH #define PX_SWITCH 0 #endif +#ifndef PX_SOLARIS +#define PX_SOLARIS 0 +#endif #ifndef PX_UWP #define PX_UWP 0 #endif @@ -266,7 +271,7 @@ #define PX_MICROSOFT_FAMILY (PX_XBOXONE || PX_WINDOWS_FAMILY || PX_XBOX_SERIES_X) #define PX_LINUX_FAMILY (PX_LINUX || PX_ANDROID) #define PX_APPLE_FAMILY (PX_IOS || PX_OSX) // equivalent to #if __APPLE__ -#define PX_UNIX_FAMILY (PX_LINUX_FAMILY || PX_APPLE_FAMILY) // shortcut for unix/posix platforms +#define PX_UNIX_FAMILY (PX_LINUX_FAMILY || PX_APPLE_FAMILY || PX_SOLARIS) // shortcut for unix/posix platforms #if defined(__EMSCRIPTEN__) #define PX_EMSCRIPTEN 1 #else --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/pxshared/include/foundation/unix/PxUnixIntrinsics.h @@ -33,7 +33,7 @@ #include "foundation/Px.h" #include "foundation/PxSharedAssert.h" -#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY) +#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SOLARIS) #error "This file should only be included by Unix builds!!" #endif --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsAllocator.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsAllocator.h @@ -118,6 +118,9 @@ #elif PX_SWITCH #include #define PxAlloca(x) alloca(x) +#elif PX_SOLARIS + #include + #define PxAlloca(x) alloca(x) #endif #define PxAllocaAligned(x, alignment) ((size_t(PxAlloca(x + alignment)) + (alignment - 1)) & ~size_t(alignment - 1)) --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsFPU.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsFPU.h @@ -79,7 +79,7 @@ #if PX_WINDOWS_FAMILY || PX_XBOXONE || PX_XBOX_SERIES_X #include "windows/PsWindowsFPU.h" -#elif (PX_LINUX && PX_SSE2) || PX_PS4 || PX_OSX +#elif (PX_LINUX && PX_SSE2) || PX_PS4 || PX_OSX || PX_SOLARIS #include "unix/PsUnixFPU.h" #else PX_INLINE physx::shdfnd::SIMDGuard::SIMDGuard() --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsIntrinsics.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsIntrinsics.h @@ -34,7 +34,7 @@ #if PX_WINDOWS_FAMILY #include "windows/PsWindowsIntrinsics.h" -#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4) +#elif(PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 || PX_SOLARIS) #include "unix/PsUnixIntrinsics.h" #elif PX_XBOXONE #include "XboxOne/PsXboxOneIntrinsics.h" --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsThread.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsThread.h @@ -41,7 +41,7 @@ #if PX_WINDOWS_FAMILY || PX_XBOXONE || PX_XBOX_SERIES_X #define PxSpinLockPause() __asm pause -#elif PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SWITCH +#elif PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SWITCH || PX_SOLARIS #define PxSpinLockPause() asm("nop") #else #error "Platform not supported!" --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsTime.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/PsTime.h @@ -84,7 +84,7 @@ Second getLastTime() const; private: -#if PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 +#if PX_LINUX || PX_ANDROID || PX_APPLE_FAMILY || PX_PS4 || PX_SOLARIS Second mLastTime; #else int64_t mTickCount; --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixIntrinsics.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixIntrinsics.h @@ -45,7 +45,7 @@ // this file is for internal intrinsics - that is, intrinsics that are used in // cross platform code but do not appear in the API -#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY) +#if !(PX_LINUX || PX_ANDROID || PX_PS4 || PX_APPLE_FAMILY || PX_SOLARIS) #error "This file should only be included by unix builds!!" #endif --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/physxextensions/src/serialization/SnSerialUtils.cpp.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/physxextensions/src/serialization/SnSerialUtils.cpp @@ -39,7 +39,7 @@ namespace { -#define SN_NUM_BINARY_PLATFORMS 19 +#define SN_NUM_BINARY_PLATFORMS 20 const PxU32 sBinaryPlatformTags[SN_NUM_BINARY_PLATFORMS] = { PX_MAKE_FOURCC('W','_','3','2'), @@ -82,6 +82,7 @@ "uwparm64", "macarm", "linuxarm", + "solaris64", "unknown", }; @@ -127,8 +128,10 @@ return sBinaryPlatformTags[16]; #elif PX_LINUX && PX_ARM return sBinaryPlatformTags[17]; +#elif PX_SOLARIS && PX_A64 + return sBinaryPlatformTags[18] #else - return sBinaryPlatformTags[18]; + return sBinaryPlatformTags[19]; #endif } --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/sse2/PsUnixSse2AoS.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/sse2/PsUnixSse2AoS.h @@ -43,7 +43,7 @@ namespace aos { -#if PX_EMSCRIPTEN || PX_SSE2 +#if PX_EMSCRIPTEN || PX_SSE2 || PX_SOLARIS typedef int8_t __int8_t; typedef int16_t __int16_t; typedef int32_t __int32_t; --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixFPU.cpp.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixFPU.cpp @@ -28,7 +28,7 @@ // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. #include "PsFPU.h" -#if !(defined(__CYGWIN__) || PX_ANDROID || PX_PS4) +#if !(defined(__CYGWIN__) || PX_ANDROID || PX_PS4 || PX_SOLARIS) #include PX_COMPILE_TIME_ASSERT(8 * sizeof(uint32_t) >= sizeof(fenv_t)); #endif @@ -42,6 +42,8 @@ { #if defined(__CYGWIN__) #pragma message "FPUGuard::FPUGuard() is not implemented" +#elif PX_SOLARIS +#pragma message "FPUGuard::FPUGuard() is not implemented" #elif PX_ANDROID // not supported unless ARM_HARD_FLOAT is enabled. #elif PX_PS4 @@ -72,6 +74,8 @@ { #if defined(__CYGWIN__) #pragma message "FPUGuard::~FPUGuard() is not implemented" +#elif PX_SOLARIS +#pragma message "FPUGuard::~FPUGuard() is not implemented" #elif PX_ANDROID // not supported unless ARM_HARD_FLOAT is enabled. #elif PX_PS4 --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/src/unix/PsUnixThread.cpp @@ -36,7 +36,7 @@ #include "PsThread.h" #include -#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && __GLIBC__ +#if !PX_APPLE_FAMILY && !defined(ANDROID) && !defined(__CYGWIN__) && !PX_PS4 && !PX_EMSCRIPTEN && !PX_SOLARIS && __GLIBC__ #include // PTHREAD_STACK_MIN #endif #include @@ -44,7 +44,7 @@ #include #if !PX_PS4 #include -#if !PX_APPLE_FAMILY && !PX_EMSCRIPTEN +#if !PX_APPLE_FAMILY && !PX_EMSCRIPTEN && !PX_SOLARIS #include #include #endif @@ -110,7 +110,7 @@ static void setTid(_ThreadImpl& threadImpl) { // query TID -#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV) +#if PX_PS4 || (defined (TARGET_OS_TV) && TARGET_OS_TV) || PX_SOLARIS // AM: TODO: neither of the below are implemented #elif PX_APPLE_FAMILY threadImpl.tid = syscall(SYS_gettid); @@ -326,6 +326,8 @@ prevMask = setAffinityMaskPS4(getThread(this)->thread, mask); #elif PX_EMSCRIPTEN // not supported +#elif PX_SOLARIS + // not supported #elif !PX_APPLE_FAMILY // Apple doesn't support syscall with getaffinity and setaffinity int32_t errGet = syscall(__NR_sched_getaffinity, getThread(this)->tid, sizeof(prevMask), &prevMask); if(errGet < 0) --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/pvd/include/PxProfileAllocatorWrapper.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/pvd/include/PxProfileAllocatorWrapper.h @@ -38,6 +38,7 @@ #include "PsArray.h" #include "PsHashMap.h" +#include namespace physx { namespace profile { --- qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixFPU.h.orig +++ qt-everywhere-src-6.9.3/qtquick3dphysics/src/3rdparty/PhysX/source/foundation/include/unix/PsUnixFPU.h @@ -32,7 +32,7 @@ #include "foundation/PxPreprocessor.h" -#if PX_LINUX || PX_PS4 || PX_OSX +#if PX_LINUX || PX_PS4 || PX_OSX || PX_SOLARIS #if PX_X86 || PX_X64 #if PX_EMSCRIPTEN