Blast 1.1.3. See docs/release_notes.txt.v1.1.3_rc1

1 files changed, 177 insertions, 177 deletions

diff --git a/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvSerializer.inl b/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvSerializer.inl
index e9298bb..d3989e9 100644..100755
--- a/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvSerializer.inl
+++ b/sdk/extensions/import/apexmodules/nvparutils/nvparameterized/NvSerializer.inl
@@ -1,177 +1,177 @@
-// This code contains NVIDIA Confidential Information and is disclosed to you
-// under a form of NVIDIA software license agreement provided separately to you.
-//
-// Notice
-// NVIDIA Corporation and its licensors retain all intellectual property and
-// proprietary rights in and to this software and related documentation and
-// any modifications thereto. Any use, reproduction, disclosure, or
-// distribution of this software and related documentation without an express
-// license agreement from NVIDIA Corporation is strictly prohibited.
-//
-// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES
-// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO
-// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,
-// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-//
-// Information and code furnished is believed to be accurate and reliable.
-// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such
-// information or for any infringement of patents or other rights of third parties that may
-// result from its use. No license is granted by implication or otherwise under any patent
-// or patent rights of NVIDIA Corporation. Details are subject to change without notice.
-// This code supersedes and replaces all information previously supplied.
-// NVIDIA Corporation products are not authorized for use as critical
-// components in life support devices or systems without express written approval of
-// NVIDIA Corporation.
-//
-// Copyright (c) 2008-2013 NVIDIA Corporation. All rights reserved.
-
-#include "NvParameterized.h"
-#include "NvParameterizedTraits.h"
-
-namespace NvParameterized
-{
-
-/*!
-\brief Serializer::SerializePlatform and Serializer::DeserializedData inline implementation
-*/
-
-/**
-\brief Check binary compatibility of compiler versions
-*/
-PX_INLINE bool DoCompilerVersMatch(SerializePlatform::CompilerType t, uint32_t v1, uint32_t v2)
-{
-	PX_UNUSED(t);
-	if( SerializePlatform::ANY_VERSION == v1 || SerializePlatform::ANY_VERSION == v2 )
-		return true;
-	
-	//In future we should distinguish compiler versions which have different ABI
-	//but now we are optimistic
-
-	return true;
-}
-
-/**
-\brief Check binary compatibility of OS versions
-*/
-PX_INLINE bool DoOsVersMatch(SerializePlatform::OsType t, uint32_t v1, uint32_t v2)
-{
-	PX_UNUSED(t);
-	if( SerializePlatform::ANY_VERSION == v1 || SerializePlatform::ANY_VERSION == v2 )
-		return true;
-	
-	return true; //See comment for doCompilerVersMatch
-}
-
-PX_INLINE SerializePlatform::SerializePlatform()
-	: archType(ARCH_LAST),
-	compilerType(COMP_LAST),
-	compilerVer(ANY_VERSION),
-	osType(OS_LAST),
-	osVer(ANY_VERSION)
-{}
-
-PX_INLINE SerializePlatform::SerializePlatform(ArchType archType_, CompilerType compType_, uint32_t compVer_, OsType osType_, uint32_t osVer_)
-	: archType(archType_),
-	compilerType(compType_),
-	compilerVer(compVer_),
-	osType(osType_),
-	osVer(osVer_)
-{}
-
-PX_INLINE bool SerializePlatform::operator ==(const SerializePlatform &p) const
-{
-	return archType == p.archType
-		&& compilerType == p.compilerType
-		&& osType == p.osType
-		&& DoCompilerVersMatch(compilerType, compilerVer, p.compilerVer)
-		&& DoOsVersMatch(osType, osVer, p.osVer);
-}
-
-PX_INLINE bool SerializePlatform::operator !=(const SerializePlatform &p) const
-{
-	return !(*this == p);
-}
-
-template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize>::DeserializedResults(): objs(0), nobjs(0), traits(0) {}
-
-template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize>::DeserializedResults(const Serializer::DeserializedResults<T, bufSize> &data)
-{
-	*this = data;
-}
-
-template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize> &Serializer::DeserializedResults<T, bufSize>::operator =(const Serializer::DeserializedResults<T, bufSize> &rhs)
-{
-	if( this == &rhs )
-		return *this;
-
-	init(rhs.traits, rhs.objs, rhs.nobjs);
-	return *this;
-}
-
-template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::clear()
-{
-	if ( objs && objs != buf ) //Memory was allocated?
-	{
-		PX_ASSERT(traits);
-		traits->free(objs);
-	}
-}
-
-template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize>::~DeserializedResults()
-{
-	clear();
-}
-
-template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::init(Traits *traits_, T *objs_, uint32_t nobjs_)
-{
-	init(traits_, nobjs_);
-	::memcpy(objs, objs_, nobjs * sizeof(T));
-}
-
-template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::init(Traits *traits_, uint32_t nobjs_)
-{
-	clear();
-
-	traits = traits_;
-	nobjs = nobjs_;
-
-	//Allocate memory if buf is too small
-	objs = nobjs <= bufSize
-		? buf
-		: (T *)traits->alloc(nobjs * sizeof(T));
-}
-
-template<typename T, int bufSize> PX_INLINE uint32_t Serializer::DeserializedResults<T, bufSize>::size() const
-{
-	return nobjs;
-}
-
-template<typename T, int bufSize> PX_INLINE T &Serializer::DeserializedResults<T, bufSize>::operator[](uint32_t i)
-{
-	PX_ASSERT( i < nobjs );
-	return objs[i];
-}
-
-template<typename T, int bufSize> PX_INLINE const T &Serializer::DeserializedResults<T, bufSize>::operator[](uint32_t i) const
-{
-	PX_ASSERT( i < nobjs );
-	return objs[i];
-}
-
-template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::getObjects(T *outObjs)
-{
-	::memcpy(outObjs, objs, nobjs * sizeof(T));
-}
-
-template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::releaseAll()
-{
-	for(uint32_t i = 0; i < nobjs; ++i)
-	{
-		if (objs[i]) 
-		{
-			objs[i]->destroy(); // FIXME What should we do with buf. And should we delete T* obj? 
-		}
-	}
-}
-
-} // namespace NvParameterized
+// This code contains NVIDIA Confidential Information and is disclosed to you

+// under a form of NVIDIA software license agreement provided separately to you.

+//

+// Notice

+// NVIDIA Corporation and its licensors retain all intellectual property and

+// proprietary rights in and to this software and related documentation and

+// any modifications thereto. Any use, reproduction, disclosure, or

+// distribution of this software and related documentation without an express

+// license agreement from NVIDIA Corporation is strictly prohibited.

+//

+// ALL NVIDIA DESIGN SPECIFICATIONS, CODE ARE PROVIDED "AS IS.". NVIDIA MAKES

+// NO WARRANTIES, EXPRESSED, IMPLIED, STATUTORY, OR OTHERWISE WITH RESPECT TO

+// THE MATERIALS, AND EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES OF NONINFRINGEMENT,

+// MERCHANTABILITY, AND FITNESS FOR A PARTICULAR PURPOSE.

+//

+// Information and code furnished is believed to be accurate and reliable.

+// However, NVIDIA Corporation assumes no responsibility for the consequences of use of such

+// information or for any infringement of patents or other rights of third parties that may

+// result from its use. No license is granted by implication or otherwise under any patent

+// or patent rights of NVIDIA Corporation. Details are subject to change without notice.

+// This code supersedes and replaces all information previously supplied.

+// NVIDIA Corporation products are not authorized for use as critical

+// components in life support devices or systems without express written approval of

+// NVIDIA Corporation.

+//

+// Copyright (c) 2008-2013 NVIDIA Corporation. All rights reserved.

+

+#include "NvParameterized.h"

+#include "NvParameterizedTraits.h"

+

+namespace NvParameterized

+{

+

+/*!

+\brief Serializer::SerializePlatform and Serializer::DeserializedData inline implementation

+*/

+

+/**

+\brief Check binary compatibility of compiler versions

+*/

+PX_INLINE bool DoCompilerVersMatch(SerializePlatform::CompilerType t, uint32_t v1, uint32_t v2)

+{

+	PX_UNUSED(t);

+	if( SerializePlatform::ANY_VERSION == v1 || SerializePlatform::ANY_VERSION == v2 )

+		return true;

+	

+	//In future we should distinguish compiler versions which have different ABI

+	//but now we are optimistic

+

+	return true;

+}

+

+/**

+\brief Check binary compatibility of OS versions

+*/

+PX_INLINE bool DoOsVersMatch(SerializePlatform::OsType t, uint32_t v1, uint32_t v2)

+{

+	PX_UNUSED(t);

+	if( SerializePlatform::ANY_VERSION == v1 || SerializePlatform::ANY_VERSION == v2 )

+		return true;

+	

+	return true; //See comment for doCompilerVersMatch

+}

+

+PX_INLINE SerializePlatform::SerializePlatform()

+	: archType(ARCH_LAST),

+	compilerType(COMP_LAST),

+	compilerVer(ANY_VERSION),

+	osType(OS_LAST),

+	osVer(ANY_VERSION)

+{}

+

+PX_INLINE SerializePlatform::SerializePlatform(ArchType archType_, CompilerType compType_, uint32_t compVer_, OsType osType_, uint32_t osVer_)

+	: archType(archType_),

+	compilerType(compType_),

+	compilerVer(compVer_),

+	osType(osType_),

+	osVer(osVer_)

+{}

+

+PX_INLINE bool SerializePlatform::operator ==(const SerializePlatform &p) const

+{

+	return archType == p.archType

+		&& compilerType == p.compilerType

+		&& osType == p.osType

+		&& DoCompilerVersMatch(compilerType, compilerVer, p.compilerVer)

+		&& DoOsVersMatch(osType, osVer, p.osVer);

+}

+

+PX_INLINE bool SerializePlatform::operator !=(const SerializePlatform &p) const

+{

+	return !(*this == p);

+}

+

+template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize>::DeserializedResults(): objs(0), nobjs(0), traits(0) {}

+

+template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize>::DeserializedResults(const Serializer::DeserializedResults<T, bufSize> &data)

+{

+	*this = data;

+}

+

+template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize> &Serializer::DeserializedResults<T, bufSize>::operator =(const Serializer::DeserializedResults<T, bufSize> &rhs)

+{

+	if( this == &rhs )

+		return *this;

+

+	init(rhs.traits, rhs.objs, rhs.nobjs);

+	return *this;

+}

+

+template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::clear()

+{

+	if ( objs && objs != buf ) //Memory was allocated?

+	{

+		PX_ASSERT(traits);

+		traits->free(objs);

+	}

+}

+

+template<typename T, int bufSize> PX_INLINE Serializer::DeserializedResults<T, bufSize>::~DeserializedResults()

+{

+	clear();

+}

+

+template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::init(Traits *traits_, T *objs_, uint32_t nobjs_)

+{

+	init(traits_, nobjs_);

+	::memcpy(objs, objs_, nobjs * sizeof(T));

+}

+

+template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::init(Traits *traits_, uint32_t nobjs_)

+{

+	clear();

+

+	traits = traits_;

+	nobjs = nobjs_;

+

+	//Allocate memory if buf is too small

+	objs = nobjs <= bufSize

+		? buf

+		: (T *)traits->alloc(nobjs * sizeof(T));

+}

+

+template<typename T, int bufSize> PX_INLINE uint32_t Serializer::DeserializedResults<T, bufSize>::size() const

+{

+	return nobjs;

+}

+

+template<typename T, int bufSize> PX_INLINE T &Serializer::DeserializedResults<T, bufSize>::operator[](uint32_t i)

+{

+	PX_ASSERT( i < nobjs );

+	return objs[i];

+}

+

+template<typename T, int bufSize> PX_INLINE const T &Serializer::DeserializedResults<T, bufSize>::operator[](uint32_t i) const

+{

+	PX_ASSERT( i < nobjs );

+	return objs[i];

+}

+

+template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::getObjects(T *outObjs)

+{

+	::memcpy(outObjs, objs, nobjs * sizeof(T));

+}

+

+template<typename T, int bufSize> PX_INLINE void Serializer::DeserializedResults<T, bufSize>::releaseAll()

+{

+	for(uint32_t i = 0; i < nobjs; ++i)

+	{

+		if (objs[i]) 

+		{

+			objs[i]->destroy(); // FIXME What should we do with buf. And should we delete T* obj? 

+		}

+	}

+}

+

+} // namespace NvParameterized