aboutsummaryrefslogtreecommitdiff
path: root/demo
diff options
context:
space:
mode:
authorMiles Macklin <[email protected]>2020-09-18 12:35:32 +1200
committerMiles Macklin <[email protected]>2020-09-18 12:35:32 +1200
commitf295a05558c1b724973508d07baa08561feb1483 (patch)
tree593593d93883dbbf1582b29c7ada7089a76fe577 /demo
parentUpdate README.md (diff)
downloadflex-f295a05558c1b724973508d07baa08561feb1483.tar.xz
flex-f295a05558c1b724973508d07baa08561feb1483.zip
Update license
Diffstat (limited to 'demo')
-rw-r--r--demo/benchmark.h2
-rw-r--r--demo/demoContext.h35
-rw-r--r--demo/helpers.h2
-rw-r--r--demo/main.cpp2
-rw-r--r--demo/opengl/shader.cpp2
-rw-r--r--demo/opengl/shader.h2
-rw-r--r--demo/opengl/shadersGL.cpp2
-rw-r--r--demo/scenes.h2
-rw-r--r--demo/shaders.h2
9 files changed, 34 insertions, 17 deletions
diff --git a/demo/benchmark.h b/demo/benchmark.h
index d04e780..eee10bb 100644
--- a/demo/benchmark.h
+++ b/demo/benchmark.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2013-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#pragma once
diff --git a/demo/demoContext.h b/demo/demoContext.h
index 1d44d93..b1a0953 100644
--- a/demo/demoContext.h
+++ b/demo/demoContext.h
@@ -1,12 +1,29 @@
-/*
-* Copyright (c) 2008-2016, NVIDIA CORPORATION. All rights reserved.
-*
-* NVIDIA CORPORATION and its licensors retain all intellectual property
-* and proprietary rights in and to this software, 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.
-*/
+// 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) 2013-2020 NVIDIA Corporation. All rights reserved.
#ifndef DEMO_CONTEXT_H
#define DEMO_CONTEXT_H
diff --git a/demo/helpers.h b/demo/helpers.h
index 5c6937e..75f063e 100644
--- a/demo/helpers.h
+++ b/demo/helpers.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2013-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#pragma once
diff --git a/demo/main.cpp b/demo/main.cpp
index ea68a31..fd2b44a 100644
--- a/demo/main.cpp
+++ b/demo/main.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2013-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#include "../core/types.h"
#include "../core/maths.h"
diff --git a/demo/opengl/shader.cpp b/demo/opengl/shader.cpp
index 027ad13..763c91c 100644
--- a/demo/opengl/shader.cpp
+++ b/demo/opengl/shader.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 20132017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#include "shader.h"
diff --git a/demo/opengl/shader.h b/demo/opengl/shader.h
index cadf557..37b16e8 100644
--- a/demo/opengl/shader.h
+++ b/demo/opengl/shader.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 20132017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#pragma once
diff --git a/demo/opengl/shadersGL.cpp b/demo/opengl/shadersGL.cpp
index c526bba..5dcdca7 100644
--- a/demo/opengl/shadersGL.cpp
+++ b/demo/opengl/shadersGL.cpp
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 20132017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#include "../shaders.h"
diff --git a/demo/scenes.h b/demo/scenes.h
index 331927b..a74634c 100644
--- a/demo/scenes.h
+++ b/demo/scenes.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2013-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#pragma once
diff --git a/demo/shaders.h b/demo/shaders.h
index 05dc911..dddeb26 100644
--- a/demo/shaders.h
+++ b/demo/shaders.h
@@ -23,7 +23,7 @@
// components in life support devices or systems without express written approval of
// NVIDIA Corporation.
//
-// Copyright (c) 2013-2017 NVIDIA Corporation. All rights reserved.
+// Copyright (c) 2013-2020 NVIDIA Corporation. All rights reserved.
#pragma once