PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2

3 files changed, 46 insertions, 2 deletions

diff --git a/APEX_1.4/NvParameterized/src/NvParameterized.cpp b/APEX_1.4/NvParameterized/src/NvParameterized.cpp
index 0e164abd..7918985d 100644
--- a/APEX_1.4/NvParameterized/src/NvParameterized.cpp
+++ b/APEX_1.4/NvParameterized/src/NvParameterized.cpp
@@ -56,6 +56,8 @@ namespace NvParameterized
 
 char Spog[] = "test";
 
+#define COND_DUP(str) (mStaticAllocation) ? (char *)(str) : local_strdup(str)
+
 template <typename T>
 void swap(T& a, T&b)
 {
@@ -64,7 +66,6 @@ void swap(T& a, T&b)
 	a = tmp;
 }
 
-#define COND_DUP(str) (mStaticAllocation) ? (char *)(str) : local_strdup(str)
 
 int32_t local_strcmp(const char* s1, const char* s2)
 {
@@ -5708,7 +5709,7 @@ ErrorType NvParameters::rawSetParamMat34LegacyArray(const Handle &handle, const
 		NV_ERR_CHECK_RETURN(memberHandle.set(offset * 12));
 
 		size_t tmp;
-		void *ptr=NULL;
+		void *ptr = NULL;
 		this->getVarPtr(memberHandle, ptr, tmp);
 		if(ptr == NULL)
 		{
diff --git a/APEX_1.4/NvParameterized/src/NvSerializer.cpp b/APEX_1.4/NvParameterized/src/NvSerializer.cpp
index 76b48a07..280f4bce 100644
--- a/APEX_1.4/NvParameterized/src/NvSerializer.cpp
+++ b/APEX_1.4/NvParameterized/src/NvSerializer.cpp
@@ -95,6 +95,8 @@ const SerializePlatform &GetCurrentPlatform()
 		platform.osType = SerializePlatform::OS_ANDROID;
 #	elif PX_LINUX == 1
 		platform.osType = SerializePlatform::OS_LINUX;
+#	elif PX_NX == 1
+		platform.osType = SerializePlatform::OS_HOS;		
 #	else
 #		error "Undefined OS"
 #	endif
@@ -112,6 +114,8 @@ const SerializePlatform &GetCurrentPlatform()
 		platform.archType = SerializePlatform::ARCH_CELL;
 #	elif PX_ARM == 1
 		platform.archType = SerializePlatform::ARCH_ARM;
+#	elif PX_A64 == 1
+		platform.archType = SerializePlatform::ARCH_ARM_64;		
 #	else
 #		error "Unknown architecture"
 #	endif
@@ -178,6 +182,18 @@ bool GetPlatform(const char *name, SerializePlatform &platform_)
 		platform_.compilerType = SerializePlatform::COMP_GCC;
 		platform_.osType = SerializePlatform::OS_ANDROID;
 	}
+	else if (0 == strcmp("HOSARM32", name))
+	{
+		platform_.archType = SerializePlatform::ARCH_ARM;
+		platform_.compilerType = SerializePlatform::COMP_GCC;
+		platform_.osType = SerializePlatform::OS_HOS;
+	}
+	else if (0 == strcmp("HOSARM64", name))
+	{
+		platform_.archType = SerializePlatform::ARCH_ARM_64;
+		platform_.compilerType = SerializePlatform::COMP_GCC;
+		platform_.osType = SerializePlatform::OS_HOS;
+	}	
 	else if( 0 == strcmp("GccLinux32", name) )
 	{
 		platform_.archType = SerializePlatform::ARCH_X86;
@@ -289,6 +305,18 @@ const char *GetPlatformName(const SerializePlatform &platform_)
 			return unknown;
 		}
 
+	case SerializePlatform::OS_HOS:
+		switch (platform.archType)
+		{
+		case SerializePlatform::ARCH_ARM:
+			return "HOSARM32";
+		case SerializePlatform::ARCH_ARM_64:
+			return "HOSARM64";
+
+		default:
+			return unknown;
+		}
+
 	case SerializePlatform::OS_LAST:
 	default:
 		return unknown;
diff --git a/APEX_1.4/NvParameterized/src/PlatformABI.cpp b/APEX_1.4/NvParameterized/src/PlatformABI.cpp
index 6062cdfe..c2d32b64 100644
--- a/APEX_1.4/NvParameterized/src/PlatformABI.cpp
+++ b/APEX_1.4/NvParameterized/src/PlatformABI.cpp
@@ -167,6 +167,21 @@ Serializer::ErrorType PlatformABI::GetPredefinedABI(const SerializePlatform &pla
 		return Serializer::ERROR_NONE;
 	}
 
+	NV_BOOL_ERR_CHECK_RETURN(GetPlatform("HOSARM32", knownPlatform), Serializer::ERROR_UNKNOWN);
+	if (knownPlatform == platform)
+	{
+		//Default params are ok
+		return Serializer::ERROR_NONE;
+	}
+
+	NV_BOOL_ERR_CHECK_RETURN(GetPlatform("HOSARM64", knownPlatform), Serializer::ERROR_UNKNOWN);
+	if (knownPlatform == platform)
+	{
+		params.doReuseParentPadding = true;
+		params.sizes.pointer = params.aligns.pointer = 8;
+		return Serializer::ERROR_NONE;
+	}	
+
 	//Add new platforms here
 
 	return Serializer::ERROR_INVALID_PLATFORM_NAME;