Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 30 insertions, 22 deletions

diff --git a/test/src/utils/TestProfiler.h b/test/src/utils/TestProfiler.h
index 318e6e6..39dbc26 100644
--- a/test/src/utils/TestProfiler.h
+++ b/test/src/utils/TestProfiler.h
@@ -1,27 +1,35 @@
-#ifndef TESTPROFILER_H
-#define TESTPROFILER_H
-
-#include "NvBlastPreprocessor.h"
-
-#if NV_NVTX  
-#include "nvToolsExt.h"
-NV_INLINE void platformZoneStart(const char* name) { nvtxRangePush(name); }
-NV_INLINE void platformZoneEnd(const char*) { nvtxRangePop(); }
+// 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) 2016-2017 NVIDIA Corporation. All rights reserved.
 
-#elif NV_XBOXONE
-#define NOMINMAX
-#include "xboxone/NvBlastProfilerXB1.h"
 
-#elif NV_PS4
-#include "ps4/NvBlastProfilerPS4.h"
-
-#else
-NV_INLINE void platformZoneStart(const char*) { }
-NV_INLINE void platformZoneEnd(const char*) { }
-
-#endif
+#ifndef TESTPROFILER_H
+#define TESTPROFILER_H
 
-#define TEST_ZONE_BEGIN(name) platformZoneStart(name)
-#define TEST_ZONE_END(name)   platformZoneEnd(name)
+#define TEST_ZONE_BEGIN(name)	platformZoneStart(name)
+#define TEST_ZONE_END(name)		platformZoneEnd()
 
 #endif // TESTPROFILER_H