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

author: Bryan Galdrikian <[email protected]> 2018-05-31 11:36:08 -0700
committer: Bryan Galdrikian <[email protected]> 2018-05-31 11:36:08 -0700
commit: 7115f60b91b5717d90f643fd692010905c7004db (patch)
tree: effd68c6978751c517d54c2f2bb5bb6e7dc93e18 /samples/SampleBase/core
parent: Updating BlastTool zip (diff)
download: blast-7115f60b91b5717d90f643fd692010905c7004db.tar.xz
blast-7115f60b91b5717d90f643fd692010905c7004db.zip
8 files changed, 1504 insertions, 1504 deletions
diff --git a/samples/SampleBase/core/Application.cpp b/samples/SampleBase/core/Application.cpp
index 6dd7de5..19883af 100644..100755
--- a/samples/SampleBase/core/Application.cpp
+++ b/samples/SampleBase/core/Application.cpp
@@ -1,91 +1,91 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#include "Application.h"
-#include <DirectXMath.h>
-#include "XInput.h"
-#include "DXUTMisc.h"
-
-
-Application::Application(std::wstring sampleName)
-: m_sampleName(sampleName)
-{
-	m_deviceManager = new DeviceManager();
-}
-
-void Application::addControllerToFront(IApplicationController* controller)
-{
-	m_controllers.push_back(controller);
-}
-
-int Application::run()
-{
-	// FirstPersonCamera uses this timer, without it it will be FPS-dependent
-	DXUTGetGlobalTimer()->Start();
-
-	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
-		m_deviceManager->AddControllerToFront(*it);
-
-	DeviceCreationParameters deviceParams;
-	deviceParams.swapChainFormat = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
-	deviceParams.swapChainSampleCount = 4;
-	deviceParams.startFullscreen = false;
-	deviceParams.backBufferWidth = 1600;
-	deviceParams.backBufferHeight = 900;
-#if defined(DEBUG) | defined(_DEBUG)
-	deviceParams.createDeviceFlags = D3D11_CREATE_DEVICE_DEBUG;
-#endif
-	deviceParams.featureLevel = D3D_FEATURE_LEVEL_11_0;
-
-	if (FAILED(m_deviceManager->CreateWindowDeviceAndSwapChain(deviceParams, m_sampleName.c_str())))
-	{
-		MessageBoxA(nullptr, "Cannot initialize the D3D11 device with the requested parameters", "Error",
-			MB_OK | MB_ICONERROR);
-		return 1;
-	}
-
-	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
-		(*it)->onInitialize();
-
-	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
-		(*it)->onSampleStart();
-
-	m_deviceManager->SetVsyncEnabled(false);
-	m_deviceManager->MessageLoop();
-
-	for (auto it = m_controllers.rbegin(); it != m_controllers.rend(); it++)
-		(*it)->onSampleStop();
-
-	for (auto it = m_controllers.rbegin(); it != m_controllers.rend(); it++)
-		(*it)->onTerminate();
-
-	m_deviceManager->Shutdown();
-	delete m_deviceManager;
-
-	return 0;
-}
+// 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-2018 NVIDIA Corporation. All rights reserved.
+
+
+#include "Application.h"
+#include <DirectXMath.h>
+#include "XInput.h"
+#include "DXUTMisc.h"
+
+
+Application::Application(std::wstring sampleName)
+: m_sampleName(sampleName)
+{
+	m_deviceManager = new DeviceManager();
+}
+
+void Application::addControllerToFront(IApplicationController* controller)
+{
+	m_controllers.push_back(controller);
+}
+
+int Application::run()
+{
+	// FirstPersonCamera uses this timer, without it it will be FPS-dependent
+	DXUTGetGlobalTimer()->Start();
+
+	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
+		m_deviceManager->AddControllerToFront(*it);
+
+	DeviceCreationParameters deviceParams;
+	deviceParams.swapChainFormat = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB;
+	deviceParams.swapChainSampleCount = 4;
+	deviceParams.startFullscreen = false;
+	deviceParams.backBufferWidth = 1600;
+	deviceParams.backBufferHeight = 900;
+#if defined(DEBUG) | defined(_DEBUG)
+	deviceParams.createDeviceFlags = D3D11_CREATE_DEVICE_DEBUG;
+#endif
+	deviceParams.featureLevel = D3D_FEATURE_LEVEL_11_0;
+
+	if (FAILED(m_deviceManager->CreateWindowDeviceAndSwapChain(deviceParams, m_sampleName.c_str())))
+	{
+		MessageBoxA(nullptr, "Cannot initialize the D3D11 device with the requested parameters", "Error",
+			MB_OK | MB_ICONERROR);
+		return 1;
+	}
+
+	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
+		(*it)->onInitialize();
+
+	for (auto it = m_controllers.begin(); it != m_controllers.end(); it++)
+		(*it)->onSampleStart();
+
+	m_deviceManager->SetVsyncEnabled(false);
+	m_deviceManager->MessageLoop();
+
+	for (auto it = m_controllers.rbegin(); it != m_controllers.rend(); it++)
+		(*it)->onSampleStop();
+
+	for (auto it = m_controllers.rbegin(); it != m_controllers.rend(); it++)
+		(*it)->onTerminate();
+
+	m_deviceManager->Shutdown();
+	delete m_deviceManager;
+
+	return 0;
+}
diff --git a/samples/SampleBase/core/Application.h b/samples/SampleBase/core/Application.h
index d9e9e93..ef7e415 100644..100755
--- a/samples/SampleBase/core/Application.h
+++ b/samples/SampleBase/core/Application.h
@@ -1,73 +1,73 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef APPLICATION_H
-#define APPLICATION_H
-
-#include <DeviceManager.h>
-#include <vector>
-#include <string>
-
-/**
-ISampleController adds more onstart and onstop callbacks to IVisualController
-*/
-class IApplicationController : public IVisualController
-{
-  public:
-	virtual void onInitialize() {}
-	virtual void onSampleStart() {}
-	virtual void onSampleStop() {}
-	virtual void onTerminate() {}
-};
-
-
-/**
-Main manager which runs sample.
-You have to add controllers to it which will receive all the start, animate, render etc. callbacks.
-*/
-class Application
-{
-public:
-	Application(std::wstring sampleName);
-	void addControllerToFront(IApplicationController* controller);
-
-	const std::vector<IApplicationController*>& getControllers() const 
-	{ 
-		return m_controllers; 
-	}
-
-	int run();
-
-private:
-	DeviceManager* m_deviceManager;
-	std::vector<IApplicationController*> m_controllers;
-	std::wstring m_sampleName;
-};
-
-
+// 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-2018 NVIDIA Corporation. All rights reserved.
+
+
+#ifndef APPLICATION_H
+#define APPLICATION_H
+
+#include <DeviceManager.h>
+#include <vector>
+#include <string>
+
+/**
+ISampleController adds more onstart and onstop callbacks to IVisualController
+*/
+class IApplicationController : public IVisualController
+{
+  public:
+	virtual void onInitialize() {}
+	virtual void onSampleStart() {}
+	virtual void onSampleStop() {}
+	virtual void onTerminate() {}
+};
+
+
+/**
+Main manager which runs sample.
+You have to add controllers to it which will receive all the start, animate, render etc. callbacks.
+*/
+class Application
+{
+public:
+	Application(std::wstring sampleName);
+	void addControllerToFront(IApplicationController* controller);
+
+	const std::vector<IApplicationController*>& getControllers() const 
+	{ 
+		return m_controllers; 
+	}
+
+	int run();
+
+private:
+	DeviceManager* m_deviceManager;
+	std::vector<IApplicationController*> m_controllers;
+	std::wstring m_sampleName;
+};
+
+
 #endif //APPLICATION_H
 \ No newline at end of file
diff --git a/samples/SampleBase/core/DeviceManager.cpp b/samples/SampleBase/core/DeviceManager.cpp
index 26f9fbb..46617cb 100644..100755
--- a/samples/SampleBase/core/DeviceManager.cpp
+++ b/samples/SampleBase/core/DeviceManager.cpp
@@ -1,795 +1,795 @@
-// TAGRELEASE: PUBLIC
-
-#include "DeviceManager.h"
-#include <WinUser.h>
-#include <Windows.h>
-#include <assert.h>
-#include <sstream>
-#include <algorithm>
-#include "SampleProfiler.h"
-
-#ifndef SAFE_RELEASE
-#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p)=NULL; } }
-#endif
-
-#define WINDOW_CLASS_NAME   L"NvDX11"
-
-#define WINDOW_STYLE_NORMAL         (WS_OVERLAPPEDWINDOW | WS_VISIBLE)
-#define WINDOW_STYLE_FULLSCREEN     (WS_POPUP | WS_SYSMENU | WS_VISIBLE)
-
-// A singleton, sort of... To pass the events from WindowProc to the object.
-DeviceManager* g_DeviceManagerInstance = NULL;
-
-#undef min
-#undef max
-
-LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    if(g_DeviceManagerInstance)
-        return g_DeviceManagerInstance->MsgProc(hWnd, uMsg, wParam, lParam);
-    else
-        return DefWindowProc(hWnd, uMsg, wParam, lParam);
-}
-
-DeviceManager* GetDeviceManager()
-{
-    return g_DeviceManagerInstance;
-}
-
-namespace
-{
-	bool IsNvDeviceID(UINT id)
-	{
-		return id == 0x10DE;
-	}
-
-	// Find an adapter whose name contains the given string.
-	IDXGIAdapter* FindAdapter(const WCHAR* targetName, bool& isNv)
-	{
-		IDXGIAdapter* targetAdapter = NULL;
-		IDXGIFactory* IDXGIFactory_0001 = NULL;
-		HRESULT hres = CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&IDXGIFactory_0001);
-		if (hres != S_OK) 
-		{
-			printf("ERROR in CreateDXGIFactory, %s@%d.\nFor more info, get log from debug D3D runtime: (1) Install DX SDK, and enable Debug D3D from DX Control Panel Utility. (2) Install and start DbgView. (3) Try running the program again.\n",__FILE__,__LINE__); 
-			return targetAdapter;
-		}
-
-		unsigned int adapterNo = 0;
-		while (SUCCEEDED(hres))
-		{
-			IDXGIAdapter* pAdapter = NULL;
-			hres = IDXGIFactory_0001->EnumAdapters(adapterNo, (IDXGIAdapter**)&pAdapter);
-
-			if (SUCCEEDED(hres))
-			{
-				DXGI_ADAPTER_DESC aDesc;
-				pAdapter->GetDesc(&aDesc);
-
-				// If no name is specified, return the first adapater.  This is the same behaviour as the 
-				// default specified for D3D11CreateDevice when no adapter is specified.
-				if (wcslen(targetName) == 0)
-				{
-					targetAdapter = pAdapter;
-					isNv = IsNvDeviceID(aDesc.VendorId);
-					break;
-				}
-
-				std::wstring aName = aDesc.Description;
-				if (aName.find(targetName) != std::string::npos)
-				{
-					targetAdapter = pAdapter;
-					isNv = IsNvDeviceID(aDesc.VendorId);
-				}
-				else
-				{
-					pAdapter->Release();
-				}
-			}
-
-			adapterNo++;
-		}
-
-		if (IDXGIFactory_0001)
-			IDXGIFactory_0001->Release();
-
-		return targetAdapter;
-	}
-
-	// Adjust window rect so that it is centred on the given adapter.  Clamps to fit if it's too big.
-	RECT MoveWindowOntoAdapter(IDXGIAdapter* targetAdapter, const RECT& rect)
-	{
-		assert(targetAdapter != NULL);
-
-		RECT result = rect;
-		HRESULT hres = S_OK;
-		unsigned int outputNo = 0;
-		while (SUCCEEDED(hres))
-		{
-			IDXGIOutput* pOutput = NULL;
-			hres = targetAdapter->EnumOutputs(outputNo++, &pOutput);
-
-			if (SUCCEEDED(hres) && pOutput)
-			{
-				DXGI_OUTPUT_DESC OutputDesc;
-				pOutput->GetDesc( &OutputDesc );
-				const RECT desktop = OutputDesc.DesktopCoordinates;
-				const int centreX = (int) desktop.left + (int)(desktop.right - desktop.left) / 2;
-				const int centreY = (int) desktop.top + (int)(desktop.bottom - desktop.top) / 2;
-				const int winW = rect.right - rect.left;
-				const int winH = rect.bottom - rect.top;
-				int left = centreX - winW/2;
-				int right = left + winW;
-				int top = centreY - winH/2;
-				int bottom = top + winH;
-				result.left = std::max(left, (int) desktop.left);
-				result.right = std::min(right, (int) desktop.right);
-				result.bottom = std::min(bottom, (int) desktop.bottom);
-				result.top = std::max(top, (int) desktop.top);
-                pOutput->Release();
-
-				// If there is more than one output, go with the first found.  Multi-monitor support could go here.
-				break;
-			}
-		}
-		return result;
-	}
-}
-
-HRESULT
-DeviceManager::CreateWindowDeviceAndSwapChain(const DeviceCreationParameters& params, std::wstring title)
-{
-    g_DeviceManagerInstance = this;
-    m_WindowTitle = title;
-
-    HINSTANCE hInstance = GetModuleHandle(NULL);
-    WNDCLASSEX windowClass = { sizeof(WNDCLASSEX), CS_HREDRAW | CS_VREDRAW, WindowProc,
-                        0L, 0L, hInstance, NULL, NULL, NULL, NULL, WINDOW_CLASS_NAME, NULL };
-
-    windowClass.hCursor = LoadCursor(NULL, IDC_ARROW);
-    
-    RegisterClassEx(&windowClass);
-
-    UINT windowStyle = params.startFullscreen 
-        ? WINDOW_STYLE_FULLSCREEN
-        : params.startMaximized 
-            ? (WINDOW_STYLE_NORMAL | WS_MAXIMIZE) 
-            : WINDOW_STYLE_NORMAL;
-        
-    RECT rect = { 0, 0, params.backBufferWidth, params.backBufferHeight };
-    AdjustWindowRect(&rect, windowStyle, FALSE);
-
-	IDXGIAdapter* targetAdapter = FindAdapter(params.adapterNameSubstring, m_IsNvidia);
-	if (targetAdapter)
-	{
-		rect = MoveWindowOntoAdapter(targetAdapter, rect);
-	}
-	else
-	{
-		// We could silently use a default adapter in this case.  I think it's better to choke.
-		std::wostringstream ostr;
-		ostr << L"Could not find an adapter matching \"" << params.adapterNameSubstring << "\"" << std::ends;
-		MessageBox(NULL, ostr.str().c_str(), m_WindowTitle.c_str(), MB_OK | MB_ICONERROR);
-        return E_FAIL;
-    }
-
-    m_hWnd = CreateWindowEx(
-        0,
-        WINDOW_CLASS_NAME, 
-        title.c_str(), 
-        windowStyle, 
-        rect.left, 
-        rect.top, 
-        rect.right - rect.left, 
-        rect.bottom - rect.top, 
-        GetDesktopWindow(),
-        NULL,
-        hInstance,
-        NULL
-    );
-
-    if(!m_hWnd)
-    {
-#ifdef DEBUG
-        DWORD errorCode = GetLastError();    
-        printf("CreateWindowEx error code = 0x%x\n", errorCode);
-#endif
-
-        MessageBox(NULL, L"Cannot create window", m_WindowTitle.c_str(), MB_OK | MB_ICONERROR);
-        return E_FAIL;
-    }
-
-    UpdateWindow(m_hWnd);
-
-    HRESULT hr = E_FAIL;
-
-    RECT clientRect;
-    GetClientRect(m_hWnd, &clientRect);
-    UINT width = clientRect.right - clientRect.left;
-    UINT height = clientRect.bottom - clientRect.top;
-
-    ZeroMemory(&m_SwapChainDesc, sizeof(m_SwapChainDesc));
-    m_SwapChainDesc.BufferCount = params.swapChainBufferCount;
-    m_SwapChainDesc.BufferDesc.Width = width;
-    m_SwapChainDesc.BufferDesc.Height = height;
-    m_SwapChainDesc.BufferDesc.Format = params.swapChainFormat;
-    m_SwapChainDesc.BufferDesc.RefreshRate.Numerator = params.refreshRate;
-    m_SwapChainDesc.BufferDesc.RefreshRate.Denominator = 0;
-    m_SwapChainDesc.BufferUsage = params.swapChainUsage;
-    m_SwapChainDesc.OutputWindow = m_hWnd;
-    m_SwapChainDesc.SampleDesc.Count = params.swapChainSampleCount;
-    m_SwapChainDesc.SampleDesc.Quality = params.swapChainSampleQuality;
-    m_SwapChainDesc.Windowed = !params.startFullscreen;
-    m_SwapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
-
-	// The D3D documentation says that if adapter is non-null, driver type must be unknown.  Why not put
-	// this logic in the CreateDevice fns then?!?
-	const D3D_DRIVER_TYPE dType = (targetAdapter)? D3D_DRIVER_TYPE_UNKNOWN: params.driverType;
-
-    hr = D3D11CreateDeviceAndSwapChain(
-        targetAdapter,          // pAdapter
-        dType,					// DriverType
-        NULL,                   // Software
-        params.createDeviceFlags, // Flags
-        &params.featureLevel,   // pFeatureLevels
-        1,                      // FeatureLevels
-        D3D11_SDK_VERSION,      // SDKVersion
-        &m_SwapChainDesc,       // pSwapChainDesc
-        &m_SwapChain,           // ppSwapChain
-        &m_Device,              // ppDevice
-        NULL,                   // pFeatureLevel
-        &m_ImmediateContext     // ppImmediateContext
-    );
-
-	if (targetAdapter)
-		targetAdapter->Release();
-    
-    if(FAILED(hr))
-        return hr;
-
-    m_DepthStencilDesc.ArraySize = 1;
-    m_DepthStencilDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL;
-    m_DepthStencilDesc.CPUAccessFlags = 0;
-    m_DepthStencilDesc.Format = params.depthStencilFormat;
-    m_DepthStencilDesc.Width = width;
-    m_DepthStencilDesc.Height = height;
-    m_DepthStencilDesc.MipLevels = 1;
-    m_DepthStencilDesc.MiscFlags = 0;
-    m_DepthStencilDesc.SampleDesc.Count = params.swapChainSampleCount;
-    m_DepthStencilDesc.SampleDesc.Quality = 0;
-    m_DepthStencilDesc.Usage = D3D11_USAGE_DEFAULT;
-    
-    hr = CreateRenderTargetAndDepthStencil();
-
-    if(FAILED(hr))
-        return hr;
-
-    DeviceCreated();
-    BackBufferResized();
-
-    return S_OK;
-}
-
-void
-DeviceManager::Shutdown() 
-{   
-    if(m_SwapChain && GetWindowState() == kWindowFullscreen)
-        m_SwapChain->SetFullscreenState(false, NULL);
-
-    DeviceDestroyed();
-
-    SAFE_RELEASE(m_BackBufferRTV);
-    SAFE_RELEASE(m_DepthStencilDSV);
-    SAFE_RELEASE(m_DepthStencilBuffer);
-
-    g_DeviceManagerInstance = NULL;
-    SAFE_RELEASE(m_ImmediateContext);
-    SAFE_RELEASE(m_SwapChain);
-
-    ID3D11Debug * d3dDebug = nullptr;
-    if (nullptr != m_Device)
-    {
-        ID3D11DeviceContext* pCtx;
-        m_Device->GetImmediateContext(&pCtx);
-        pCtx->ClearState();
-        pCtx->Flush();
-        pCtx->Release();
-        if (SUCCEEDED(m_Device->QueryInterface(__uuidof(ID3D11Debug), reinterpret_cast<void**>(&d3dDebug))))
-        {
-            d3dDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL);
-            d3dDebug->Release();
-        }
-    }
-    SAFE_RELEASE(m_Device);
-
-    if(m_hWnd)
-    {
-        DestroyWindow(m_hWnd);
-        m_hWnd = NULL;
-    }
-}
-
-HRESULT
-DeviceManager::CreateRenderTargetAndDepthStencil()
-{
-    HRESULT hr;
-
-    ID3D11Texture2D *backBuffer = NULL; 
-    hr = m_SwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBuffer);
-    if (FAILED(hr))
-        return hr;
-
-    hr = m_Device->CreateRenderTargetView(backBuffer, NULL, &m_BackBufferRTV);
-    backBuffer->Release();
-    if (FAILED(hr))
-        return hr;
-
-    if(m_DepthStencilDesc.Format != DXGI_FORMAT_UNKNOWN)
-    {
-        hr = m_Device->CreateTexture2D(&m_DepthStencilDesc, NULL, &m_DepthStencilBuffer);
-        if (FAILED(hr))
-            return hr;
-
-        hr = m_Device->CreateDepthStencilView(m_DepthStencilBuffer, NULL, &m_DepthStencilDSV);
-        if (FAILED(hr))
-            return hr;
-    }
-
-    return S_OK;
-}
-
-void
-DeviceManager::MessageLoop() 
-{
-    MSG msg = {0};
-
-    LARGE_INTEGER perfFreq, previousTime;
-    QueryPerformanceFrequency(&perfFreq);
-    QueryPerformanceCounter(&previousTime);
-    
-    while (WM_QUIT != msg.message)
-    {
-        if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-        {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-        else
-        {
-			PROFILER_BEGIN("Main Loop");
-
-            LARGE_INTEGER newTime;
-            QueryPerformanceCounter(&newTime);
-            
-            double elapsedSeconds = (m_FixedFrameInterval >= 0) 
-                ? m_FixedFrameInterval  
-                : (double)(newTime.QuadPart - previousTime.QuadPart) / (double)perfFreq.QuadPart;
-
-            if(m_SwapChain && GetWindowState() != kWindowMinimized)
-            {
-                Animate(elapsedSeconds);
-                Render(); 
-                m_SwapChain->Present(m_SyncInterval, 0);
-                Sleep(0);
-            }
-            else
-            {
-                // Release CPU resources when idle
-                Sleep(1);
-            }
-
-            {
-                m_vFrameTimes.push_back(elapsedSeconds);
-                double timeSum = 0;
-                for(auto it = m_vFrameTimes.begin(); it != m_vFrameTimes.end(); it++)
-                    timeSum += *it;
-
-                if(timeSum > m_AverageTimeUpdateInterval)
-                {
-                    m_AverageFrameTime = timeSum / (double)m_vFrameTimes.size();
-                    m_vFrameTimes.clear();
-                }
-            }
-
-            previousTime = newTime;
-
-			PROFILER_END();
-			PROFILER_RESET();
-        }
-
-    }
-}
-
-LRESULT 
-DeviceManager::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-    switch(uMsg)
-    {
-        case WM_DESTROY:
-        case WM_CLOSE:
-            PostQuitMessage(0);
-            return 0;
-
-        case WM_SYSKEYDOWN:
-            if(wParam == VK_F4)
-            {
-                PostQuitMessage(0);
-                return 0;
-            }
-            break;
-
-        case WM_ENTERSIZEMOVE:
-            m_InSizingModalLoop = true;
-            m_NewWindowSize.cx = m_SwapChainDesc.BufferDesc.Width;
-            m_NewWindowSize.cy = m_SwapChainDesc.BufferDesc.Height;
-            break;
-
-        case WM_EXITSIZEMOVE:
-            m_InSizingModalLoop = false;
-            ResizeSwapChain();
-            break;
-
-        case WM_SIZE:
-            // Ignore the WM_SIZE event if there is no device,
-            // or if the window has been minimized (size == 0),
-            // or if it has been restored to the previous size (this part is tested inside ResizeSwapChain)
-            if (m_Device && (lParam != 0))
-            {
-                m_NewWindowSize.cx = LOWORD(lParam);
-                m_NewWindowSize.cy = HIWORD(lParam);
-                    
-                if(!m_InSizingModalLoop)
-                    ResizeSwapChain();
-            }
-    }
-
-    if( uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST || 
-        uMsg >= WM_KEYFIRST && uMsg <= WM_KEYLAST )
-    {
-        // processing messages front-to-back
-        for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-        {
-            if((*it)->IsEnabled())
-            {
-                // for kb/mouse messages, 0 means the message has been handled
-                if(0 == (*it)->MsgProc(hWnd, uMsg, wParam, lParam))
-                    return 0;
-            }
-        }
-    }
-
-    return DefWindowProc(hWnd, uMsg, wParam, lParam);
-}
-
-void
-DeviceManager::ResizeSwapChain()
-{
-    if(m_NewWindowSize.cx == (LONG)m_SwapChainDesc.BufferDesc.Width && 
-       m_NewWindowSize.cy == (LONG)m_SwapChainDesc.BufferDesc.Height)
-        return;
-
-    m_SwapChainDesc.BufferDesc.Width = m_NewWindowSize.cx;
-    m_SwapChainDesc.BufferDesc.Height = m_NewWindowSize.cy;
-
-    ID3D11RenderTargetView *nullRTV = NULL;
-    m_ImmediateContext->OMSetRenderTargets(1, &nullRTV, NULL);
-    SAFE_RELEASE(m_BackBufferRTV);
-    SAFE_RELEASE(m_DepthStencilDSV);
-    SAFE_RELEASE(m_DepthStencilBuffer);
-
-    if (m_SwapChain)
-    {
-        // Resize the swap chain
-        m_SwapChain->ResizeBuffers(m_SwapChainDesc.BufferCount, m_SwapChainDesc.BufferDesc.Width, 
-                                    m_SwapChainDesc.BufferDesc.Height, m_SwapChainDesc.BufferDesc.Format, 
-                                    m_SwapChainDesc.Flags);
-                    
-        m_DepthStencilDesc.Width = m_NewWindowSize.cx;
-        m_DepthStencilDesc.Height = m_NewWindowSize.cy;
-
-        CreateRenderTargetAndDepthStencil();
-
-        BackBufferResized();
-    }
-}
-
-void
-DeviceManager::Render()
-{
-	PROFILER_SCOPED_FUNCTION();
-
-    D3D11_VIEWPORT viewport = { 0.0f, 0.0f, (float)m_SwapChainDesc.BufferDesc.Width, (float)m_SwapChainDesc.BufferDesc.Height, 0.0f, 1.0f };
-
-    // rendering back-to-front
-    for(auto it = m_vControllers.rbegin(); it != m_vControllers.rend(); it++)
-    {
-        if((*it)->IsEnabled())
-        {
-            m_ImmediateContext->OMSetRenderTargets(1, &m_BackBufferRTV, m_DepthStencilDSV);
-            m_ImmediateContext->RSSetViewports(1, &viewport);
-
-            (*it)->Render(m_Device, m_ImmediateContext, m_BackBufferRTV, m_DepthStencilDSV);
-        }
-    }
-
-    m_ImmediateContext->OMSetRenderTargets(0, NULL, NULL);
-}
-
-void
-DeviceManager::Animate(double fElapsedTimeSeconds)
-{
-	PROFILER_SCOPED_FUNCTION();
-
-    // front-to-back, but the order shouldn't matter
-    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-    {
-        if((*it)->IsEnabled())
-        {
-            (*it)->Animate(fElapsedTimeSeconds);
-        }
-    }
-}
-
-void
-DeviceManager::DeviceCreated()
-{
-    // creating resources front-to-back
-    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-    {
-        (*it)->DeviceCreated(m_Device);
-    }
-}
-
-void
-DeviceManager::DeviceDestroyed()
-{
-    // releasing resources back-to-front
-    for(auto it = m_vControllers.rbegin(); it != m_vControllers.rend(); it++)
-    {
-        (*it)->DeviceDestroyed();
-    }
-}
-
-void
-DeviceManager::BackBufferResized()
-{
-    if(m_SwapChain == NULL)
-        return;
-
-    DXGI_SURFACE_DESC backSD;
-    backSD.Format = m_SwapChainDesc.BufferDesc.Format;
-    backSD.Width = m_SwapChainDesc.BufferDesc.Width;
-    backSD.Height = m_SwapChainDesc.BufferDesc.Height;
-    backSD.SampleDesc = m_SwapChainDesc.SampleDesc;
-
-    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
-    {
-        (*it)->BackBufferResized(m_Device, &backSD);
-    }
-}
-
-HRESULT
-DeviceManager::ChangeBackBufferFormat(DXGI_FORMAT format, UINT sampleCount)
-{
-    HRESULT hr = E_FAIL;
-
-    if((format == DXGI_FORMAT_UNKNOWN || format == m_SwapChainDesc.BufferDesc.Format) &&
-       (sampleCount == 0 || sampleCount == m_SwapChainDesc.SampleDesc.Count))
-        return S_FALSE;
-
-    if(m_Device)
-    {
-        bool fullscreen = (GetWindowState() == kWindowFullscreen);
-        if(fullscreen)
-            m_SwapChain->SetFullscreenState(false, NULL);
-
-        IDXGISwapChain* newSwapChain = NULL;
-        DXGI_SWAP_CHAIN_DESC newSwapChainDesc = m_SwapChainDesc;
-
-        if(format != DXGI_FORMAT_UNKNOWN)
-            newSwapChainDesc.BufferDesc.Format = format;
-        if(sampleCount != 0)
-            newSwapChainDesc.SampleDesc.Count = sampleCount;
-
-        IDXGIAdapter* pDXGIAdapter = GetDXGIAdapter();
-
-        IDXGIFactory* pDXGIFactory = NULL;
-        pDXGIAdapter->GetParent(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&pDXGIFactory));
-
-        hr = pDXGIFactory->CreateSwapChain(m_Device, &newSwapChainDesc, &newSwapChain);
-
-        pDXGIFactory->Release();
-        pDXGIAdapter->Release();
-        
-        if (FAILED(hr))
-        {
-            if(fullscreen)
-                m_SwapChain->SetFullscreenState(true, NULL);
-
-            return hr;
-        }
-
-        SAFE_RELEASE(m_BackBufferRTV);
-        SAFE_RELEASE(m_SwapChain);
-        SAFE_RELEASE(m_DepthStencilBuffer);
-        SAFE_RELEASE(m_DepthStencilDSV);
-
-        m_SwapChain = newSwapChain;
-        m_SwapChainDesc = newSwapChainDesc;
-
-        m_DepthStencilDesc.SampleDesc.Count = sampleCount;
-
-        if(fullscreen)                
-            m_SwapChain->SetFullscreenState(true, NULL);
-
-        CreateRenderTargetAndDepthStencil();
-        BackBufferResized();
-    }
-
-    return S_OK;
-}
-
-void
-DeviceManager::AddControllerToFront(IVisualController* pController) 
-{ 
-    m_vControllers.remove(pController);
-    m_vControllers.push_front(pController);
-}
-
-void
-DeviceManager::AddControllerToBack(IVisualController* pController) 
-{
-    m_vControllers.remove(pController);
-    m_vControllers.push_back(pController);
-}
-
-void
-DeviceManager::RemoveController(IVisualController* pController) 
-{ 
-    m_vControllers.remove(pController);
-}
-
-HRESULT 
-DeviceManager::ResizeWindow(int width, int height)
-{
-    if(m_SwapChain == NULL)
-        return E_FAIL;
-
-    RECT rect;
-    GetWindowRect(m_hWnd, &rect);
-
-    ShowWindow(m_hWnd, SW_RESTORE);
-
-    if(!MoveWindow(m_hWnd, rect.left, rect.top, width, height, true))
-        return E_FAIL;
-
-    // No need to call m_SwapChain->ResizeBackBuffer because MoveWindow will send WM_SIZE, which calls that function.
-
-    return S_OK;
-}
-
-HRESULT            
-DeviceManager::EnterFullscreenMode(int width, int height)
-{
-    if(m_SwapChain == NULL)
-        return E_FAIL;
-
-    if(GetWindowState() == kWindowFullscreen)
-        return S_FALSE;
-    
-    if(width <= 0 || height <= 0)
-    {
-        width = m_SwapChainDesc.BufferDesc.Width;
-        height = m_SwapChainDesc.BufferDesc.Height;
-    }
-     
-    SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_FULLSCREEN);
-    MoveWindow(m_hWnd, 0, 0, width, height, true);
-
-    HRESULT hr = m_SwapChain->SetFullscreenState(true, NULL);
-
-    if(FAILED(hr)) 
-    {
-        SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_NORMAL);
-        return hr;
-    }
-
-    UpdateWindow(m_hWnd);
-    m_SwapChain->GetDesc(&m_SwapChainDesc);
-
-    return S_OK;
-}
-
-HRESULT            
-DeviceManager::LeaveFullscreenMode(int windowWidth, int windowHeight)
-{
-    if(m_SwapChain == NULL)
-        return E_FAIL;
-
-    if(GetWindowState() != kWindowFullscreen)
-        return S_FALSE;
-     
-    HRESULT hr = m_SwapChain->SetFullscreenState(false, NULL);
-    if(FAILED(hr)) return hr;
-
-    SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_NORMAL);
-
-    if(windowWidth <= 0 || windowHeight <= 0)
-    {
-        windowWidth = m_SwapChainDesc.BufferDesc.Width;
-        windowHeight = m_SwapChainDesc.BufferDesc.Height;
-    }
-    
-    RECT rect = { 0, 0, windowWidth, windowHeight };
-    AdjustWindowRect(&rect, WINDOW_STYLE_NORMAL, FALSE);
-    MoveWindow(m_hWnd, 0, 0, rect.right - rect.left, rect.bottom - rect.top, true);
-    UpdateWindow(m_hWnd);
-
-    m_SwapChain->GetDesc(&m_SwapChainDesc);
-
-    return S_OK;
-}
-
-HRESULT            
-DeviceManager::ToggleFullscreen()
-{
-    if(GetWindowState() == kWindowFullscreen)
-        return LeaveFullscreenMode();
-    else
-        return EnterFullscreenMode();
-}
-
-DeviceManager::WindowState
-DeviceManager::GetWindowState() 
-{ 
-    if(m_SwapChain && !m_SwapChainDesc.Windowed)
-        return kWindowFullscreen;
-
-    if(m_hWnd == INVALID_HANDLE_VALUE)
-        return kWindowNone;
-
-    if(IsZoomed(m_hWnd))
-        return kWindowMaximized;
-
-    if(IsIconic(m_hWnd))
-        return kWindowMinimized;
-
-    return kWindowNormal;
-}
-
-HRESULT
-DeviceManager::GetDisplayResolution(int& width, int& height)
-{
-    if(m_hWnd != INVALID_HANDLE_VALUE)
-    {
-        HMONITOR monitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTOPRIMARY);
-        MONITORINFO info;
-        info.cbSize = sizeof(MONITORINFO);
-
-        if(GetMonitorInfo(monitor, &info))
-        {
-            width = info.rcMonitor.right - info.rcMonitor.left;
-            height = info.rcMonitor.bottom - info.rcMonitor.top;
-            return S_OK;
-        }
-    }
-
-    return E_FAIL;
-}
-
-IDXGIAdapter*   
-DeviceManager::GetDXGIAdapter()
-{   
-    if(!m_Device)
-        return NULL;
-
-    IDXGIDevice* pDXGIDevice = NULL;
-    m_Device->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&pDXGIDevice));
-
-    IDXGIAdapter* pDXGIAdapter = NULL;
-    pDXGIDevice->GetParent(__uuidof(IDXGIAdapter), reinterpret_cast<void**>(&pDXGIAdapter));
-
-    pDXGIDevice->Release();
-
-    return pDXGIAdapter;
-}
+// TAGRELEASE: PUBLIC
+
+#include "DeviceManager.h"
+#include <WinUser.h>
+#include <Windows.h>
+#include <assert.h>
+#include <sstream>
+#include <algorithm>
+#include "SampleProfiler.h"
+
+#ifndef SAFE_RELEASE
+#define SAFE_RELEASE(p)      { if (p) { (p)->Release(); (p)=NULL; } }
+#endif
+
+#define WINDOW_CLASS_NAME   L"NvDX11"
+
+#define WINDOW_STYLE_NORMAL         (WS_OVERLAPPEDWINDOW | WS_VISIBLE)
+#define WINDOW_STYLE_FULLSCREEN     (WS_POPUP | WS_SYSMENU | WS_VISIBLE)
+
+// A singleton, sort of... To pass the events from WindowProc to the object.
+DeviceManager* g_DeviceManagerInstance = NULL;
+
+#undef min
+#undef max
+
+LRESULT CALLBACK WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    if(g_DeviceManagerInstance)
+        return g_DeviceManagerInstance->MsgProc(hWnd, uMsg, wParam, lParam);
+    else
+        return DefWindowProc(hWnd, uMsg, wParam, lParam);
+}
+
+DeviceManager* GetDeviceManager()
+{
+    return g_DeviceManagerInstance;
+}
+
+namespace
+{
+	bool IsNvDeviceID(UINT id)
+	{
+		return id == 0x10DE;
+	}
+
+	// Find an adapter whose name contains the given string.
+	IDXGIAdapter* FindAdapter(const WCHAR* targetName, bool& isNv)
+	{
+		IDXGIAdapter* targetAdapter = NULL;
+		IDXGIFactory* IDXGIFactory_0001 = NULL;
+		HRESULT hres = CreateDXGIFactory(__uuidof(IDXGIFactory), (void**)&IDXGIFactory_0001);
+		if (hres != S_OK) 
+		{
+			printf("ERROR in CreateDXGIFactory, %s@%d.\nFor more info, get log from debug D3D runtime: (1) Install DX SDK, and enable Debug D3D from DX Control Panel Utility. (2) Install and start DbgView. (3) Try running the program again.\n",__FILE__,__LINE__); 
+			return targetAdapter;
+		}
+
+		unsigned int adapterNo = 0;
+		while (SUCCEEDED(hres))
+		{
+			IDXGIAdapter* pAdapter = NULL;
+			hres = IDXGIFactory_0001->EnumAdapters(adapterNo, (IDXGIAdapter**)&pAdapter);
+
+			if (SUCCEEDED(hres))
+			{
+				DXGI_ADAPTER_DESC aDesc;
+				pAdapter->GetDesc(&aDesc);
+
+				// If no name is specified, return the first adapater.  This is the same behaviour as the 
+				// default specified for D3D11CreateDevice when no adapter is specified.
+				if (wcslen(targetName) == 0)
+				{
+					targetAdapter = pAdapter;
+					isNv = IsNvDeviceID(aDesc.VendorId);
+					break;
+				}
+
+				std::wstring aName = aDesc.Description;
+				if (aName.find(targetName) != std::string::npos)
+				{
+					targetAdapter = pAdapter;
+					isNv = IsNvDeviceID(aDesc.VendorId);
+				}
+				else
+				{
+					pAdapter->Release();
+				}
+			}
+
+			adapterNo++;
+		}
+
+		if (IDXGIFactory_0001)
+			IDXGIFactory_0001->Release();
+
+		return targetAdapter;
+	}
+
+	// Adjust window rect so that it is centred on the given adapter.  Clamps to fit if it's too big.
+	RECT MoveWindowOntoAdapter(IDXGIAdapter* targetAdapter, const RECT& rect)
+	{
+		assert(targetAdapter != NULL);
+
+		RECT result = rect;
+		HRESULT hres = S_OK;
+		unsigned int outputNo = 0;
+		while (SUCCEEDED(hres))
+		{
+			IDXGIOutput* pOutput = NULL;
+			hres = targetAdapter->EnumOutputs(outputNo++, &pOutput);
+
+			if (SUCCEEDED(hres) && pOutput)
+			{
+				DXGI_OUTPUT_DESC OutputDesc;
+				pOutput->GetDesc( &OutputDesc );
+				const RECT desktop = OutputDesc.DesktopCoordinates;
+				const int centreX = (int) desktop.left + (int)(desktop.right - desktop.left) / 2;
+				const int centreY = (int) desktop.top + (int)(desktop.bottom - desktop.top) / 2;
+				const int winW = rect.right - rect.left;
+				const int winH = rect.bottom - rect.top;
+				int left = centreX - winW/2;
+				int right = left + winW;
+				int top = centreY - winH/2;
+				int bottom = top + winH;
+				result.left = std::max(left, (int) desktop.left);
+				result.right = std::min(right, (int) desktop.right);
+				result.bottom = std::min(bottom, (int) desktop.bottom);
+				result.top = std::max(top, (int) desktop.top);
+                pOutput->Release();
+
+				// If there is more than one output, go with the first found.  Multi-monitor support could go here.
+				break;
+			}
+		}
+		return result;
+	}
+}
+
+HRESULT
+DeviceManager::CreateWindowDeviceAndSwapChain(const DeviceCreationParameters& params, std::wstring title)
+{
+    g_DeviceManagerInstance = this;
+    m_WindowTitle = title;
+
+    HINSTANCE hInstance = GetModuleHandle(NULL);
+    WNDCLASSEX windowClass = { sizeof(WNDCLASSEX), CS_HREDRAW | CS_VREDRAW, WindowProc,
+                        0L, 0L, hInstance, NULL, NULL, NULL, NULL, WINDOW_CLASS_NAME, NULL };
+
+    windowClass.hCursor = LoadCursor(NULL, IDC_ARROW);
+    
+    RegisterClassEx(&windowClass);
+
+    UINT windowStyle = params.startFullscreen 
+        ? WINDOW_STYLE_FULLSCREEN
+        : params.startMaximized 
+            ? (WINDOW_STYLE_NORMAL | WS_MAXIMIZE) 
+            : WINDOW_STYLE_NORMAL;
+        
+    RECT rect = { 0, 0, params.backBufferWidth, params.backBufferHeight };
+    AdjustWindowRect(&rect, windowStyle, FALSE);
+
+	IDXGIAdapter* targetAdapter = FindAdapter(params.adapterNameSubstring, m_IsNvidia);
+	if (targetAdapter)
+	{
+		rect = MoveWindowOntoAdapter(targetAdapter, rect);
+	}
+	else
+	{
+		// We could silently use a default adapter in this case.  I think it's better to choke.
+		std::wostringstream ostr;
+		ostr << L"Could not find an adapter matching \"" << params.adapterNameSubstring << "\"" << std::ends;
+		MessageBox(NULL, ostr.str().c_str(), m_WindowTitle.c_str(), MB_OK | MB_ICONERROR);
+        return E_FAIL;
+    }
+
+    m_hWnd = CreateWindowEx(
+        0,
+        WINDOW_CLASS_NAME, 
+        title.c_str(), 
+        windowStyle, 
+        rect.left, 
+        rect.top, 
+        rect.right - rect.left, 
+        rect.bottom - rect.top, 
+        GetDesktopWindow(),
+        NULL,
+        hInstance,
+        NULL
+    );
+
+    if(!m_hWnd)
+    {
+#ifdef DEBUG
+        DWORD errorCode = GetLastError();    
+        printf("CreateWindowEx error code = 0x%x\n", errorCode);
+#endif
+
+        MessageBox(NULL, L"Cannot create window", m_WindowTitle.c_str(), MB_OK | MB_ICONERROR);
+        return E_FAIL;
+    }
+
+    UpdateWindow(m_hWnd);
+
+    HRESULT hr = E_FAIL;
+
+    RECT clientRect;
+    GetClientRect(m_hWnd, &clientRect);
+    UINT width = clientRect.right - clientRect.left;
+    UINT height = clientRect.bottom - clientRect.top;
+
+    ZeroMemory(&m_SwapChainDesc, sizeof(m_SwapChainDesc));
+    m_SwapChainDesc.BufferCount = params.swapChainBufferCount;
+    m_SwapChainDesc.BufferDesc.Width = width;
+    m_SwapChainDesc.BufferDesc.Height = height;
+    m_SwapChainDesc.BufferDesc.Format = params.swapChainFormat;
+    m_SwapChainDesc.BufferDesc.RefreshRate.Numerator = params.refreshRate;
+    m_SwapChainDesc.BufferDesc.RefreshRate.Denominator = 0;
+    m_SwapChainDesc.BufferUsage = params.swapChainUsage;
+    m_SwapChainDesc.OutputWindow = m_hWnd;
+    m_SwapChainDesc.SampleDesc.Count = params.swapChainSampleCount;
+    m_SwapChainDesc.SampleDesc.Quality = params.swapChainSampleQuality;
+    m_SwapChainDesc.Windowed = !params.startFullscreen;
+    m_SwapChainDesc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
+
+	// The D3D documentation says that if adapter is non-null, driver type must be unknown.  Why not put
+	// this logic in the CreateDevice fns then?!?
+	const D3D_DRIVER_TYPE dType = (targetAdapter)? D3D_DRIVER_TYPE_UNKNOWN: params.driverType;
+
+    hr = D3D11CreateDeviceAndSwapChain(
+        targetAdapter,          // pAdapter
+        dType,					// DriverType
+        NULL,                   // Software
+        params.createDeviceFlags, // Flags
+        &params.featureLevel,   // pFeatureLevels
+        1,                      // FeatureLevels
+        D3D11_SDK_VERSION,      // SDKVersion
+        &m_SwapChainDesc,       // pSwapChainDesc
+        &m_SwapChain,           // ppSwapChain
+        &m_Device,              // ppDevice
+        NULL,                   // pFeatureLevel
+        &m_ImmediateContext     // ppImmediateContext
+    );
+
+	if (targetAdapter)
+		targetAdapter->Release();
+    
+    if(FAILED(hr))
+        return hr;
+
+    m_DepthStencilDesc.ArraySize = 1;
+    m_DepthStencilDesc.BindFlags = D3D11_BIND_DEPTH_STENCIL;
+    m_DepthStencilDesc.CPUAccessFlags = 0;
+    m_DepthStencilDesc.Format = params.depthStencilFormat;
+    m_DepthStencilDesc.Width = width;
+    m_DepthStencilDesc.Height = height;
+    m_DepthStencilDesc.MipLevels = 1;
+    m_DepthStencilDesc.MiscFlags = 0;
+    m_DepthStencilDesc.SampleDesc.Count = params.swapChainSampleCount;
+    m_DepthStencilDesc.SampleDesc.Quality = 0;
+    m_DepthStencilDesc.Usage = D3D11_USAGE_DEFAULT;
+    
+    hr = CreateRenderTargetAndDepthStencil();
+
+    if(FAILED(hr))
+        return hr;
+
+    DeviceCreated();
+    BackBufferResized();
+
+    return S_OK;
+}
+
+void
+DeviceManager::Shutdown() 
+{   
+    if(m_SwapChain && GetWindowState() == kWindowFullscreen)
+        m_SwapChain->SetFullscreenState(false, NULL);
+
+    DeviceDestroyed();
+
+    SAFE_RELEASE(m_BackBufferRTV);
+    SAFE_RELEASE(m_DepthStencilDSV);
+    SAFE_RELEASE(m_DepthStencilBuffer);
+
+    g_DeviceManagerInstance = NULL;
+    SAFE_RELEASE(m_ImmediateContext);
+    SAFE_RELEASE(m_SwapChain);
+
+    ID3D11Debug * d3dDebug = nullptr;
+    if (nullptr != m_Device)
+    {
+        ID3D11DeviceContext* pCtx;
+        m_Device->GetImmediateContext(&pCtx);
+        pCtx->ClearState();
+        pCtx->Flush();
+        pCtx->Release();
+        if (SUCCEEDED(m_Device->QueryInterface(__uuidof(ID3D11Debug), reinterpret_cast<void**>(&d3dDebug))))
+        {
+            d3dDebug->ReportLiveDeviceObjects(D3D11_RLDO_DETAIL);
+            d3dDebug->Release();
+        }
+    }
+    SAFE_RELEASE(m_Device);
+
+    if(m_hWnd)
+    {
+        DestroyWindow(m_hWnd);
+        m_hWnd = NULL;
+    }
+}
+
+HRESULT
+DeviceManager::CreateRenderTargetAndDepthStencil()
+{
+    HRESULT hr;
+
+    ID3D11Texture2D *backBuffer = NULL; 
+    hr = m_SwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&backBuffer);
+    if (FAILED(hr))
+        return hr;
+
+    hr = m_Device->CreateRenderTargetView(backBuffer, NULL, &m_BackBufferRTV);
+    backBuffer->Release();
+    if (FAILED(hr))
+        return hr;
+
+    if(m_DepthStencilDesc.Format != DXGI_FORMAT_UNKNOWN)
+    {
+        hr = m_Device->CreateTexture2D(&m_DepthStencilDesc, NULL, &m_DepthStencilBuffer);
+        if (FAILED(hr))
+            return hr;
+
+        hr = m_Device->CreateDepthStencilView(m_DepthStencilBuffer, NULL, &m_DepthStencilDSV);
+        if (FAILED(hr))
+            return hr;
+    }
+
+    return S_OK;
+}
+
+void
+DeviceManager::MessageLoop() 
+{
+    MSG msg = {0};
+
+    LARGE_INTEGER perfFreq, previousTime;
+    QueryPerformanceFrequency(&perfFreq);
+    QueryPerformanceCounter(&previousTime);
+    
+    while (WM_QUIT != msg.message)
+    {
+        if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+        }
+        else
+        {
+			PROFILER_BEGIN("Main Loop");
+
+            LARGE_INTEGER newTime;
+            QueryPerformanceCounter(&newTime);
+            
+            double elapsedSeconds = (m_FixedFrameInterval >= 0) 
+                ? m_FixedFrameInterval  
+                : (double)(newTime.QuadPart - previousTime.QuadPart) / (double)perfFreq.QuadPart;
+
+            if(m_SwapChain && GetWindowState() != kWindowMinimized)
+            {
+                Animate(elapsedSeconds);
+                Render(); 
+                m_SwapChain->Present(m_SyncInterval, 0);
+                Sleep(0);
+            }
+            else
+            {
+                // Release CPU resources when idle
+                Sleep(1);
+            }
+
+            {
+                m_vFrameTimes.push_back(elapsedSeconds);
+                double timeSum = 0;
+                for(auto it = m_vFrameTimes.begin(); it != m_vFrameTimes.end(); it++)
+                    timeSum += *it;
+
+                if(timeSum > m_AverageTimeUpdateInterval)
+                {
+                    m_AverageFrameTime = timeSum / (double)m_vFrameTimes.size();
+                    m_vFrameTimes.clear();
+                }
+            }
+
+            previousTime = newTime;
+
+			PROFILER_END();
+			PROFILER_RESET();
+        }
+
+    }
+}
+
+LRESULT 
+DeviceManager::MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+    switch(uMsg)
+    {
+        case WM_DESTROY:
+        case WM_CLOSE:
+            PostQuitMessage(0);
+            return 0;
+
+        case WM_SYSKEYDOWN:
+            if(wParam == VK_F4)
+            {
+                PostQuitMessage(0);
+                return 0;
+            }
+            break;
+
+        case WM_ENTERSIZEMOVE:
+            m_InSizingModalLoop = true;
+            m_NewWindowSize.cx = m_SwapChainDesc.BufferDesc.Width;
+            m_NewWindowSize.cy = m_SwapChainDesc.BufferDesc.Height;
+            break;
+
+        case WM_EXITSIZEMOVE:
+            m_InSizingModalLoop = false;
+            ResizeSwapChain();
+            break;
+
+        case WM_SIZE:
+            // Ignore the WM_SIZE event if there is no device,
+            // or if the window has been minimized (size == 0),
+            // or if it has been restored to the previous size (this part is tested inside ResizeSwapChain)
+            if (m_Device && (lParam != 0))
+            {
+                m_NewWindowSize.cx = LOWORD(lParam);
+                m_NewWindowSize.cy = HIWORD(lParam);
+                    
+                if(!m_InSizingModalLoop)
+                    ResizeSwapChain();
+            }
+    }
+
+    if( uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST || 
+        uMsg >= WM_KEYFIRST && uMsg <= WM_KEYLAST )
+    {
+        // processing messages front-to-back
+        for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
+        {
+            if((*it)->IsEnabled())
+            {
+                // for kb/mouse messages, 0 means the message has been handled
+                if(0 == (*it)->MsgProc(hWnd, uMsg, wParam, lParam))
+                    return 0;
+            }
+        }
+    }
+
+    return DefWindowProc(hWnd, uMsg, wParam, lParam);
+}
+
+void
+DeviceManager::ResizeSwapChain()
+{
+    if(m_NewWindowSize.cx == (LONG)m_SwapChainDesc.BufferDesc.Width && 
+       m_NewWindowSize.cy == (LONG)m_SwapChainDesc.BufferDesc.Height)
+        return;
+
+    m_SwapChainDesc.BufferDesc.Width = m_NewWindowSize.cx;
+    m_SwapChainDesc.BufferDesc.Height = m_NewWindowSize.cy;
+
+    ID3D11RenderTargetView *nullRTV = NULL;
+    m_ImmediateContext->OMSetRenderTargets(1, &nullRTV, NULL);
+    SAFE_RELEASE(m_BackBufferRTV);
+    SAFE_RELEASE(m_DepthStencilDSV);
+    SAFE_RELEASE(m_DepthStencilBuffer);
+
+    if (m_SwapChain)
+    {
+        // Resize the swap chain
+        m_SwapChain->ResizeBuffers(m_SwapChainDesc.BufferCount, m_SwapChainDesc.BufferDesc.Width, 
+                                    m_SwapChainDesc.BufferDesc.Height, m_SwapChainDesc.BufferDesc.Format, 
+                                    m_SwapChainDesc.Flags);
+                    
+        m_DepthStencilDesc.Width = m_NewWindowSize.cx;
+        m_DepthStencilDesc.Height = m_NewWindowSize.cy;
+
+        CreateRenderTargetAndDepthStencil();
+
+        BackBufferResized();
+    }
+}
+
+void
+DeviceManager::Render()
+{
+	PROFILER_SCOPED_FUNCTION();
+
+    D3D11_VIEWPORT viewport = { 0.0f, 0.0f, (float)m_SwapChainDesc.BufferDesc.Width, (float)m_SwapChainDesc.BufferDesc.Height, 0.0f, 1.0f };
+
+    // rendering back-to-front
+    for(auto it = m_vControllers.rbegin(); it != m_vControllers.rend(); it++)
+    {
+        if((*it)->IsEnabled())
+        {
+            m_ImmediateContext->OMSetRenderTargets(1, &m_BackBufferRTV, m_DepthStencilDSV);
+            m_ImmediateContext->RSSetViewports(1, &viewport);
+
+            (*it)->Render(m_Device, m_ImmediateContext, m_BackBufferRTV, m_DepthStencilDSV);
+        }
+    }
+
+    m_ImmediateContext->OMSetRenderTargets(0, NULL, NULL);
+}
+
+void
+DeviceManager::Animate(double fElapsedTimeSeconds)
+{
+	PROFILER_SCOPED_FUNCTION();
+
+    // front-to-back, but the order shouldn't matter
+    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
+    {
+        if((*it)->IsEnabled())
+        {
+            (*it)->Animate(fElapsedTimeSeconds);
+        }
+    }
+}
+
+void
+DeviceManager::DeviceCreated()
+{
+    // creating resources front-to-back
+    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
+    {
+        (*it)->DeviceCreated(m_Device);
+    }
+}
+
+void
+DeviceManager::DeviceDestroyed()
+{
+    // releasing resources back-to-front
+    for(auto it = m_vControllers.rbegin(); it != m_vControllers.rend(); it++)
+    {
+        (*it)->DeviceDestroyed();
+    }
+}
+
+void
+DeviceManager::BackBufferResized()
+{
+    if(m_SwapChain == NULL)
+        return;
+
+    DXGI_SURFACE_DESC backSD;
+    backSD.Format = m_SwapChainDesc.BufferDesc.Format;
+    backSD.Width = m_SwapChainDesc.BufferDesc.Width;
+    backSD.Height = m_SwapChainDesc.BufferDesc.Height;
+    backSD.SampleDesc = m_SwapChainDesc.SampleDesc;
+
+    for(auto it = m_vControllers.begin(); it != m_vControllers.end(); it++)
+    {
+        (*it)->BackBufferResized(m_Device, &backSD);
+    }
+}
+
+HRESULT
+DeviceManager::ChangeBackBufferFormat(DXGI_FORMAT format, UINT sampleCount)
+{
+    HRESULT hr = E_FAIL;
+
+    if((format == DXGI_FORMAT_UNKNOWN || format == m_SwapChainDesc.BufferDesc.Format) &&
+       (sampleCount == 0 || sampleCount == m_SwapChainDesc.SampleDesc.Count))
+        return S_FALSE;
+
+    if(m_Device)
+    {
+        bool fullscreen = (GetWindowState() == kWindowFullscreen);
+        if(fullscreen)
+            m_SwapChain->SetFullscreenState(false, NULL);
+
+        IDXGISwapChain* newSwapChain = NULL;
+        DXGI_SWAP_CHAIN_DESC newSwapChainDesc = m_SwapChainDesc;
+
+        if(format != DXGI_FORMAT_UNKNOWN)
+            newSwapChainDesc.BufferDesc.Format = format;
+        if(sampleCount != 0)
+            newSwapChainDesc.SampleDesc.Count = sampleCount;
+
+        IDXGIAdapter* pDXGIAdapter = GetDXGIAdapter();
+
+        IDXGIFactory* pDXGIFactory = NULL;
+        pDXGIAdapter->GetParent(__uuidof(IDXGIFactory), reinterpret_cast<void**>(&pDXGIFactory));
+
+        hr = pDXGIFactory->CreateSwapChain(m_Device, &newSwapChainDesc, &newSwapChain);
+
+        pDXGIFactory->Release();
+        pDXGIAdapter->Release();
+        
+        if (FAILED(hr))
+        {
+            if(fullscreen)
+                m_SwapChain->SetFullscreenState(true, NULL);
+
+            return hr;
+        }
+
+        SAFE_RELEASE(m_BackBufferRTV);
+        SAFE_RELEASE(m_SwapChain);
+        SAFE_RELEASE(m_DepthStencilBuffer);
+        SAFE_RELEASE(m_DepthStencilDSV);
+
+        m_SwapChain = newSwapChain;
+        m_SwapChainDesc = newSwapChainDesc;
+
+        m_DepthStencilDesc.SampleDesc.Count = sampleCount;
+
+        if(fullscreen)                
+            m_SwapChain->SetFullscreenState(true, NULL);
+
+        CreateRenderTargetAndDepthStencil();
+        BackBufferResized();
+    }
+
+    return S_OK;
+}
+
+void
+DeviceManager::AddControllerToFront(IVisualController* pController) 
+{ 
+    m_vControllers.remove(pController);
+    m_vControllers.push_front(pController);
+}
+
+void
+DeviceManager::AddControllerToBack(IVisualController* pController) 
+{
+    m_vControllers.remove(pController);
+    m_vControllers.push_back(pController);
+}
+
+void
+DeviceManager::RemoveController(IVisualController* pController) 
+{ 
+    m_vControllers.remove(pController);
+}
+
+HRESULT 
+DeviceManager::ResizeWindow(int width, int height)
+{
+    if(m_SwapChain == NULL)
+        return E_FAIL;
+
+    RECT rect;
+    GetWindowRect(m_hWnd, &rect);
+
+    ShowWindow(m_hWnd, SW_RESTORE);
+
+    if(!MoveWindow(m_hWnd, rect.left, rect.top, width, height, true))
+        return E_FAIL;
+
+    // No need to call m_SwapChain->ResizeBackBuffer because MoveWindow will send WM_SIZE, which calls that function.
+
+    return S_OK;
+}
+
+HRESULT            
+DeviceManager::EnterFullscreenMode(int width, int height)
+{
+    if(m_SwapChain == NULL)
+        return E_FAIL;
+
+    if(GetWindowState() == kWindowFullscreen)
+        return S_FALSE;
+    
+    if(width <= 0 || height <= 0)
+    {
+        width = m_SwapChainDesc.BufferDesc.Width;
+        height = m_SwapChainDesc.BufferDesc.Height;
+    }
+     
+    SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_FULLSCREEN);
+    MoveWindow(m_hWnd, 0, 0, width, height, true);
+
+    HRESULT hr = m_SwapChain->SetFullscreenState(true, NULL);
+
+    if(FAILED(hr)) 
+    {
+        SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_NORMAL);
+        return hr;
+    }
+
+    UpdateWindow(m_hWnd);
+    m_SwapChain->GetDesc(&m_SwapChainDesc);
+
+    return S_OK;
+}
+
+HRESULT            
+DeviceManager::LeaveFullscreenMode(int windowWidth, int windowHeight)
+{
+    if(m_SwapChain == NULL)
+        return E_FAIL;
+
+    if(GetWindowState() != kWindowFullscreen)
+        return S_FALSE;
+     
+    HRESULT hr = m_SwapChain->SetFullscreenState(false, NULL);
+    if(FAILED(hr)) return hr;
+
+    SetWindowLong(m_hWnd, GWL_STYLE, WINDOW_STYLE_NORMAL);
+
+    if(windowWidth <= 0 || windowHeight <= 0)
+    {
+        windowWidth = m_SwapChainDesc.BufferDesc.Width;
+        windowHeight = m_SwapChainDesc.BufferDesc.Height;
+    }
+    
+    RECT rect = { 0, 0, windowWidth, windowHeight };
+    AdjustWindowRect(&rect, WINDOW_STYLE_NORMAL, FALSE);
+    MoveWindow(m_hWnd, 0, 0, rect.right - rect.left, rect.bottom - rect.top, true);
+    UpdateWindow(m_hWnd);
+
+    m_SwapChain->GetDesc(&m_SwapChainDesc);
+
+    return S_OK;
+}
+
+HRESULT            
+DeviceManager::ToggleFullscreen()
+{
+    if(GetWindowState() == kWindowFullscreen)
+        return LeaveFullscreenMode();
+    else
+        return EnterFullscreenMode();
+}
+
+DeviceManager::WindowState
+DeviceManager::GetWindowState() 
+{ 
+    if(m_SwapChain && !m_SwapChainDesc.Windowed)
+        return kWindowFullscreen;
+
+    if(m_hWnd == INVALID_HANDLE_VALUE)
+        return kWindowNone;
+
+    if(IsZoomed(m_hWnd))
+        return kWindowMaximized;
+
+    if(IsIconic(m_hWnd))
+        return kWindowMinimized;
+
+    return kWindowNormal;
+}
+
+HRESULT
+DeviceManager::GetDisplayResolution(int& width, int& height)
+{
+    if(m_hWnd != INVALID_HANDLE_VALUE)
+    {
+        HMONITOR monitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTOPRIMARY);
+        MONITORINFO info;
+        info.cbSize = sizeof(MONITORINFO);
+
+        if(GetMonitorInfo(monitor, &info))
+        {
+            width = info.rcMonitor.right - info.rcMonitor.left;
+            height = info.rcMonitor.bottom - info.rcMonitor.top;
+            return S_OK;
+        }
+    }
+
+    return E_FAIL;
+}
+
+IDXGIAdapter*   
+DeviceManager::GetDXGIAdapter()
+{   
+    if(!m_Device)
+        return NULL;
+
+    IDXGIDevice* pDXGIDevice = NULL;
+    m_Device->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&pDXGIDevice));
+
+    IDXGIAdapter* pDXGIAdapter = NULL;
+    pDXGIDevice->GetParent(__uuidof(IDXGIAdapter), reinterpret_cast<void**>(&pDXGIAdapter));
+
+    pDXGIDevice->Release();
+
+    return pDXGIAdapter;
+}
diff --git a/samples/SampleBase/core/DeviceManager.h b/samples/SampleBase/core/DeviceManager.h
index 98b8eee..b321583 100644..100755
--- a/samples/SampleBase/core/DeviceManager.h
+++ b/samples/SampleBase/core/DeviceManager.h
@@ -1,166 +1,166 @@
-// TAGRELEASE: PUBLIC
-
-#pragma once
-#include <Windows.h>
-#include <DXGI.h>
-#include <D3D11.h>
-#include <list>
-
-
-struct DeviceCreationParameters
-{
-    bool startMaximized;
-    bool startFullscreen;
-    int backBufferWidth;
-    int backBufferHeight;
-    int refreshRate;
-    int swapChainBufferCount;
-    DXGI_FORMAT swapChainFormat;
-    DXGI_FORMAT depthStencilFormat;
-    DXGI_USAGE swapChainUsage;
-    int swapChainSampleCount;
-    int swapChainSampleQuality;
-    UINT createDeviceFlags;
-    D3D_DRIVER_TYPE driverType;
-    D3D_FEATURE_LEVEL featureLevel;
-
-	// For use in the case of multiple adapters.  If this is non-null, device creation will try to match
-	// the given string against an adapter name.  If the specified string exists as a sub-string of the 
-	// adapter name, the device and window will be created on that adapter.  Case sensitive.
-	const WCHAR* adapterNameSubstring;
-
-    DeviceCreationParameters() 
-        : startMaximized(false)
-        , startFullscreen(false)
-        , backBufferWidth(1280)
-        , backBufferHeight(720)
-        , refreshRate(0)
-        , swapChainBufferCount(1)
-        , swapChainFormat(DXGI_FORMAT_R8G8B8A8_UNORM)
-        , depthStencilFormat(DXGI_FORMAT_D24_UNORM_S8_UINT)
-        , swapChainUsage(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT)
-        , swapChainSampleCount(1)
-        , swapChainSampleQuality(0)
-        , createDeviceFlags(0)
-        , driverType(D3D_DRIVER_TYPE_HARDWARE)
-        , featureLevel(D3D_FEATURE_LEVEL_11_0)
-		, adapterNameSubstring(L"")
-    { }
-};
-
-#pragma warning(push)
-#pragma warning(disable: 4100) // unreferenced formal parameter
-class IVisualController
-{
-private:
-    bool            m_Enabled;
-public:
-    IVisualController() : m_Enabled(true) { }
-
-    virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return 1; }
-    virtual void Render(ID3D11Device* pDevice, ID3D11DeviceContext* pDeviceContext, ID3D11RenderTargetView* pRTV, ID3D11DepthStencilView* pDSV) { }
-    virtual void Animate(double fElapsedTimeSeconds) { }
-    virtual HRESULT DeviceCreated(ID3D11Device* pDevice) { return S_OK; }
-    virtual void DeviceDestroyed() { }
-    virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc) { }
-
-    virtual void EnableController() { m_Enabled = true; }
-    virtual void DisableController() { m_Enabled = false; }
-    virtual bool IsEnabled() { return m_Enabled; }
-};
-#pragma warning(pop)
-
-class DeviceManager
-{
-public:
-    enum WindowState
-    {
-        kWindowNone,
-        kWindowNormal,
-        kWindowMinimized,
-        kWindowMaximized,
-        kWindowFullscreen
-    };
-
-protected:
-    ID3D11Device*           m_Device;
-    ID3D11DeviceContext*    m_ImmediateContext;
-    IDXGISwapChain*         m_SwapChain;
-    ID3D11RenderTargetView* m_BackBufferRTV;
-    ID3D11Texture2D*        m_DepthStencilBuffer;
-    ID3D11DepthStencilView* m_DepthStencilDSV;
-    DXGI_SWAP_CHAIN_DESC    m_SwapChainDesc;
-    D3D11_TEXTURE2D_DESC    m_DepthStencilDesc;
-	bool					m_IsNvidia;
-    HWND                    m_hWnd;
-    std::list<IVisualController*> m_vControllers;
-    std::wstring            m_WindowTitle;
-    double                  m_FixedFrameInterval;
-    UINT                    m_SyncInterval;
-    std::list<double>       m_vFrameTimes;
-    double                  m_AverageFrameTime;
-    double                  m_AverageTimeUpdateInterval;
-    bool                    m_InSizingModalLoop;
-    SIZE                    m_NewWindowSize;
-private:
-    HRESULT                 CreateRenderTargetAndDepthStencil();
-    void                    ResizeSwapChain();
-public:
-
-    DeviceManager()
-        : m_Device(NULL)
-        , m_ImmediateContext(NULL)
-        , m_SwapChain(NULL)
-        , m_BackBufferRTV(NULL)
-        , m_DepthStencilBuffer(NULL)
-        , m_DepthStencilDSV(NULL)
-		, m_IsNvidia(false)
-        , m_hWnd(NULL)
-        , m_WindowTitle(L"")
-        , m_FixedFrameInterval(-1)
-        , m_SyncInterval(0)
-        , m_AverageFrameTime(0)
-        , m_AverageTimeUpdateInterval(0.5)
-        , m_InSizingModalLoop(false)
-    { }
-
-    virtual ~DeviceManager() 
-    { Shutdown(); }
-
-    virtual HRESULT CreateWindowDeviceAndSwapChain(const DeviceCreationParameters& params, std::wstring windowTitle);
-    virtual HRESULT ChangeBackBufferFormat(DXGI_FORMAT format, UINT sampleCount);
-    virtual HRESULT ResizeWindow(int width, int height);
-    virtual HRESULT EnterFullscreenMode(int width = 0, int height = 0);
-    virtual HRESULT LeaveFullscreenMode(int windowWidth = 0, int windowHeight = 0);
-    virtual HRESULT ToggleFullscreen();
-
-    virtual void    Shutdown();
-    virtual void    MessageLoop();
-    virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-    virtual void    Render();
-    virtual void    Animate(double fElapsedTimeSeconds);
-    virtual void    DeviceCreated();
-    virtual void    DeviceDestroyed();
-    virtual void    BackBufferResized();
-
-    void            AddControllerToFront(IVisualController* pController);
-    void            AddControllerToBack(IVisualController* pController);
-    void            RemoveController(IVisualController* pController);
-
-    void            SetFixedFrameInterval(double seconds) { m_FixedFrameInterval = seconds; }
-    void            DisableFixedFrameInterval() { m_FixedFrameInterval = -1; }
-
-	bool			IsNvidia() const { return m_IsNvidia; }
-    HWND            GetHWND() { return m_hWnd; }
-    ID3D11Device*   GetDevice() { return m_Device; }
-    WindowState     GetWindowState();
-    bool            GetVsyncEnabled() { return m_SyncInterval > 0; }
-    void            SetVsyncEnabled(bool enabled) { m_SyncInterval = enabled ? 1 : 0; }
-    HRESULT         GetDisplayResolution(int& width, int& height);
-    IDXGIAdapter*   GetDXGIAdapter();
-    double          GetAverageFrameTime() { return m_AverageFrameTime; }
-    void            SetAverageTimeUpdateInterval(double value) { m_AverageTimeUpdateInterval = value; }
-};
-
-
-DeviceManager* GetDeviceManager();
+// TAGRELEASE: PUBLIC
+
+#pragma once
+#include <Windows.h>
+#include <DXGI.h>
+#include <D3D11.h>
+#include <list>
+
+
+struct DeviceCreationParameters
+{
+    bool startMaximized;
+    bool startFullscreen;
+    int backBufferWidth;
+    int backBufferHeight;
+    int refreshRate;
+    int swapChainBufferCount;
+    DXGI_FORMAT swapChainFormat;
+    DXGI_FORMAT depthStencilFormat;
+    DXGI_USAGE swapChainUsage;
+    int swapChainSampleCount;
+    int swapChainSampleQuality;
+    UINT createDeviceFlags;
+    D3D_DRIVER_TYPE driverType;
+    D3D_FEATURE_LEVEL featureLevel;
+
+	// For use in the case of multiple adapters.  If this is non-null, device creation will try to match
+	// the given string against an adapter name.  If the specified string exists as a sub-string of the 
+	// adapter name, the device and window will be created on that adapter.  Case sensitive.
+	const WCHAR* adapterNameSubstring;
+
+    DeviceCreationParameters() 
+        : startMaximized(false)
+        , startFullscreen(false)
+        , backBufferWidth(1280)
+        , backBufferHeight(720)
+        , refreshRate(0)
+        , swapChainBufferCount(1)
+        , swapChainFormat(DXGI_FORMAT_R8G8B8A8_UNORM)
+        , depthStencilFormat(DXGI_FORMAT_D24_UNORM_S8_UINT)
+        , swapChainUsage(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT)
+        , swapChainSampleCount(1)
+        , swapChainSampleQuality(0)
+        , createDeviceFlags(0)
+        , driverType(D3D_DRIVER_TYPE_HARDWARE)
+        , featureLevel(D3D_FEATURE_LEVEL_11_0)
+		, adapterNameSubstring(L"")
+    { }
+};
+
+#pragma warning(push)
+#pragma warning(disable: 4100) // unreferenced formal parameter
+class IVisualController
+{
+private:
+    bool            m_Enabled;
+public:
+    IVisualController() : m_Enabled(true) { }
+
+    virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return 1; }
+    virtual void Render(ID3D11Device* pDevice, ID3D11DeviceContext* pDeviceContext, ID3D11RenderTargetView* pRTV, ID3D11DepthStencilView* pDSV) { }
+    virtual void Animate(double fElapsedTimeSeconds) { }
+    virtual HRESULT DeviceCreated(ID3D11Device* pDevice) { return S_OK; }
+    virtual void DeviceDestroyed() { }
+    virtual void BackBufferResized(ID3D11Device* pDevice, const DXGI_SURFACE_DESC* pBackBufferSurfaceDesc) { }
+
+    virtual void EnableController() { m_Enabled = true; }
+    virtual void DisableController() { m_Enabled = false; }
+    virtual bool IsEnabled() { return m_Enabled; }
+};
+#pragma warning(pop)
+
+class DeviceManager
+{
+public:
+    enum WindowState
+    {
+        kWindowNone,
+        kWindowNormal,
+        kWindowMinimized,
+        kWindowMaximized,
+        kWindowFullscreen
+    };
+
+protected:
+    ID3D11Device*           m_Device;
+    ID3D11DeviceContext*    m_ImmediateContext;
+    IDXGISwapChain*         m_SwapChain;
+    ID3D11RenderTargetView* m_BackBufferRTV;
+    ID3D11Texture2D*        m_DepthStencilBuffer;
+    ID3D11DepthStencilView* m_DepthStencilDSV;
+    DXGI_SWAP_CHAIN_DESC    m_SwapChainDesc;
+    D3D11_TEXTURE2D_DESC    m_DepthStencilDesc;
+	bool					m_IsNvidia;
+    HWND                    m_hWnd;
+    std::list<IVisualController*> m_vControllers;
+    std::wstring            m_WindowTitle;
+    double                  m_FixedFrameInterval;
+    UINT                    m_SyncInterval;
+    std::list<double>       m_vFrameTimes;
+    double                  m_AverageFrameTime;
+    double                  m_AverageTimeUpdateInterval;
+    bool                    m_InSizingModalLoop;
+    SIZE                    m_NewWindowSize;
+private:
+    HRESULT                 CreateRenderTargetAndDepthStencil();
+    void                    ResizeSwapChain();
+public:
+
+    DeviceManager()
+        : m_Device(NULL)
+        , m_ImmediateContext(NULL)
+        , m_SwapChain(NULL)
+        , m_BackBufferRTV(NULL)
+        , m_DepthStencilBuffer(NULL)
+        , m_DepthStencilDSV(NULL)
+		, m_IsNvidia(false)
+        , m_hWnd(NULL)
+        , m_WindowTitle(L"")
+        , m_FixedFrameInterval(-1)
+        , m_SyncInterval(0)
+        , m_AverageFrameTime(0)
+        , m_AverageTimeUpdateInterval(0.5)
+        , m_InSizingModalLoop(false)
+    { }
+
+    virtual ~DeviceManager() 
+    { Shutdown(); }
+
+    virtual HRESULT CreateWindowDeviceAndSwapChain(const DeviceCreationParameters& params, std::wstring windowTitle);
+    virtual HRESULT ChangeBackBufferFormat(DXGI_FORMAT format, UINT sampleCount);
+    virtual HRESULT ResizeWindow(int width, int height);
+    virtual HRESULT EnterFullscreenMode(int width = 0, int height = 0);
+    virtual HRESULT LeaveFullscreenMode(int windowWidth = 0, int windowHeight = 0);
+    virtual HRESULT ToggleFullscreen();
+
+    virtual void    Shutdown();
+    virtual void    MessageLoop();
+    virtual LRESULT MsgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    virtual void    Render();
+    virtual void    Animate(double fElapsedTimeSeconds);
+    virtual void    DeviceCreated();
+    virtual void    DeviceDestroyed();
+    virtual void    BackBufferResized();
+
+    void            AddControllerToFront(IVisualController* pController);
+    void            AddControllerToBack(IVisualController* pController);
+    void            RemoveController(IVisualController* pController);
+
+    void            SetFixedFrameInterval(double seconds) { m_FixedFrameInterval = seconds; }
+    void            DisableFixedFrameInterval() { m_FixedFrameInterval = -1; }
+
+	bool			IsNvidia() const { return m_IsNvidia; }
+    HWND            GetHWND() { return m_hWnd; }
+    ID3D11Device*   GetDevice() { return m_Device; }
+    WindowState     GetWindowState();
+    bool            GetVsyncEnabled() { return m_SyncInterval > 0; }
+    void            SetVsyncEnabled(bool enabled) { m_SyncInterval = enabled ? 1 : 0; }
+    HRESULT         GetDisplayResolution(int& width, int& height);
+    IDXGIAdapter*   GetDXGIAdapter();
+    double          GetAverageFrameTime() { return m_AverageFrameTime; }
+    void            SetAverageTimeUpdateInterval(double value) { m_AverageTimeUpdateInterval = value; }
+};
+
+
+DeviceManager* GetDeviceManager();
diff --git a/samples/SampleBase/core/SampleController.cpp b/samples/SampleBase/core/SampleController.cpp
index dc49f90..7240458 100644..100755
--- a/samples/SampleBase/core/SampleController.cpp
+++ b/samples/SampleBase/core/SampleController.cpp
@@ -1,85 +1,85 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#include "SampleController.h"
-#include "SceneController.h"
-#include "CommonUIController.h"
-#include "BlastController.h"
-#include "PhysXController.h"
-#include "Renderer.h"
-
-#include "imgui.h"
-
-SampleController::SampleController()
-{
-}
-
-SampleController::~SampleController()
-{
-}
-
-void SampleController::onSampleStart()
-{
-	// start with GPU physics by default
-	setUseGPUPhysics(true);
-}
-
-
-void SampleController::setUseGPUPhysics(bool useGPUPhysics)
-{
-	if (!getPhysXController().getGPUPhysicsAvailable())
-	{
-		useGPUPhysics = false;
-	}
-
-	if (getPhysXController().getUseGPUPhysics() == useGPUPhysics)
-	{
-		return;
-	}
-
-	int assetNum = getSceneController().releaseAll();
-
-	getBlastController().notifyPhysXControllerRelease();
-	getPhysXController().setUseGPUPhysics(useGPUPhysics);
-	getBlastController().reinitialize();
-
-	getRenderer().clearQueue();
-
-	getSceneController().spawnAsset(assetNum);
-}
-
-
-void SampleController::drawPhysXGpuUI()
-{
-	// GPU Physics
-	bool useGPU = getPhysXController().getUseGPUPhysics();
-	if (ImGui::Checkbox("Use GPU Physics", &useGPU))
-	{
-		getCommonUIController().addDelayedCall([=]() { setUseGPUPhysics(useGPU); }, "Loading...");
-	}
+// 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-2018 NVIDIA Corporation. All rights reserved.
+
+
+#include "SampleController.h"
+#include "SceneController.h"
+#include "CommonUIController.h"
+#include "BlastController.h"
+#include "PhysXController.h"
+#include "Renderer.h"
+
+#include "imgui.h"
+
+SampleController::SampleController()
+{
+}
+
+SampleController::~SampleController()
+{
+}
+
+void SampleController::onSampleStart()
+{
+	// start with GPU physics by default
+	setUseGPUPhysics(true);
+}
+
+
+void SampleController::setUseGPUPhysics(bool useGPUPhysics)
+{
+	if (!getPhysXController().getGPUPhysicsAvailable())
+	{
+		useGPUPhysics = false;
+	}
+
+	if (getPhysXController().getUseGPUPhysics() == useGPUPhysics)
+	{
+		return;
+	}
+
+	int assetNum = getSceneController().releaseAll();
+
+	getBlastController().notifyPhysXControllerRelease();
+	getPhysXController().setUseGPUPhysics(useGPUPhysics);
+	getBlastController().reinitialize();
+
+	getRenderer().clearQueue();
+
+	getSceneController().spawnAsset(assetNum);
+}
+
+
+void SampleController::drawPhysXGpuUI()
+{
+	// GPU Physics
+	bool useGPU = getPhysXController().getUseGPUPhysics();
+	if (ImGui::Checkbox("Use GPU Physics", &useGPU))
+	{
+		getCommonUIController().addDelayedCall([=]() { setUseGPUPhysics(useGPU); }, "Loading...");
+	}
 }
 \ No newline at end of file
diff --git a/samples/SampleBase/core/SampleController.h b/samples/SampleBase/core/SampleController.h
index c0f72ce..313c952 100644..100755
--- a/samples/SampleBase/core/SampleController.h
+++ b/samples/SampleBase/core/SampleController.h
@@ -1,80 +1,80 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLE_CONTROLLER_H
-#define SAMPLE_CONTROLLER_H
-
-#include "SampleManager.h"
-
-class SampleController : public ISampleController
-{
-public:
-	SampleController();
-	virtual ~SampleController();
-
-	virtual void onSampleStart();
-	void drawPhysXGpuUI();
-
-private:
-	SampleController& operator= (SampleController&);
-
-
-	//////// used controllers ////////
-
-	PhysXController& getPhysXController() const
-	{
-		return getManager()->getPhysXController();
-	}
-
-	BlastController& getBlastController() const
-	{
-		return getManager()->getBlastController();
-	}
-
-	SceneController& getSceneController() const
-	{
-		return getManager()->getSceneController();
-	}
-
-	CommonUIController& getCommonUIController() const
-	{
-		return getManager()->getCommonUIController();
-	}
-
-	Renderer& getRenderer() const
-	{
-		return getManager()->getRenderer();
-	}
-
-
-	//////// private methods ////////
-
-	void setUseGPUPhysics(bool useGPUPhysics);
-};
-
+// 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-2018 NVIDIA Corporation. All rights reserved.
+
+
+#ifndef SAMPLE_CONTROLLER_H
+#define SAMPLE_CONTROLLER_H
+
+#include "SampleManager.h"
+
+class SampleController : public ISampleController
+{
+public:
+	SampleController();
+	virtual ~SampleController();
+
+	virtual void onSampleStart();
+	void drawPhysXGpuUI();
+
+private:
+	SampleController& operator= (SampleController&);
+
+
+	//////// used controllers ////////
+
+	PhysXController& getPhysXController() const
+	{
+		return getManager()->getPhysXController();
+	}
+
+	BlastController& getBlastController() const
+	{
+		return getManager()->getBlastController();
+	}
+
+	SceneController& getSceneController() const
+	{
+		return getManager()->getSceneController();
+	}
+
+	CommonUIController& getCommonUIController() const
+	{
+		return getManager()->getCommonUIController();
+	}
+
+	Renderer& getRenderer() const
+	{
+		return getManager()->getRenderer();
+	}
+
+
+	//////// private methods ////////
+
+	void setUseGPUPhysics(bool useGPUPhysics);
+};
+
 #endif
 \ No newline at end of file
diff --git a/samples/SampleBase/core/SampleManager.cpp b/samples/SampleBase/core/SampleManager.cpp
index 6f0a7ef..b31113a 100644..100755
--- a/samples/SampleBase/core/SampleManager.cpp
+++ b/samples/SampleBase/core/SampleManager.cpp
@@ -1,90 +1,90 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#include "SampleManager.h"
-
-#include "Utils.h"
-
-#include "Renderer.h"
-#include "PhysXController.h"
-#include "BlastController.h"
-#include "CommonUIController.h"
-#include "DamageToolController.h"
-#include "SceneController.h"
-#include "SampleController.h"
-
-
-SampleManager::SampleManager(const SampleConfig& config) 
-: m_config(config)
-{
-}
-
-int SampleManager::run()
-{
-	Application app(getConfig().sampleName);
-
-	m_renderer = new Renderer();
-	m_physXController = new PhysXController(ExtImpactDamageManager::FilterShader);
-	m_blastController = new BlastController();
-	m_sceneController = new SceneController();
-	m_damageToolController = new DamageToolController();
-	m_sampleController = new SampleController();
-	m_commonUIController = new CommonUIController();
-
-	app.addControllerToFront(m_renderer);
-	app.addControllerToFront(m_physXController);
-	app.addControllerToFront(m_blastController);
-	app.addControllerToFront(m_sceneController);
-	app.addControllerToFront(m_damageToolController);
-	app.addControllerToFront(m_sampleController);
-	app.addControllerToFront(m_commonUIController);
-
-	for (IApplicationController* c : app.getControllers())
-	{
-		(static_cast<ISampleController*>(c))->setManager(this);
-	}
-
-	int result = app.run();
-
-	delete m_renderer;
-	delete m_physXController;
-	delete m_blastController;
-	delete m_sceneController;
-	delete m_damageToolController;
-	delete m_sampleController;
-	delete m_commonUIController;
-
-	return result;
-}
-
-
-int runSample(const SampleConfig& config)
-{
-	SampleManager sampleManager(config);
-	return sampleManager.run();
+// 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-2018 NVIDIA Corporation. All rights reserved.
+
+
+#include "SampleManager.h"
+
+#include "Utils.h"
+
+#include "Renderer.h"
+#include "PhysXController.h"
+#include "BlastController.h"
+#include "CommonUIController.h"
+#include "DamageToolController.h"
+#include "SceneController.h"
+#include "SampleController.h"
+
+
+SampleManager::SampleManager(const SampleConfig& config) 
+: m_config(config)
+{
+}
+
+int SampleManager::run()
+{
+	Application app(getConfig().sampleName);
+
+	m_renderer = new Renderer();
+	m_physXController = new PhysXController(ExtImpactDamageManager::FilterShader);
+	m_blastController = new BlastController();
+	m_sceneController = new SceneController();
+	m_damageToolController = new DamageToolController();
+	m_sampleController = new SampleController();
+	m_commonUIController = new CommonUIController();
+
+	app.addControllerToFront(m_renderer);
+	app.addControllerToFront(m_physXController);
+	app.addControllerToFront(m_blastController);
+	app.addControllerToFront(m_sceneController);
+	app.addControllerToFront(m_damageToolController);
+	app.addControllerToFront(m_sampleController);
+	app.addControllerToFront(m_commonUIController);
+
+	for (IApplicationController* c : app.getControllers())
+	{
+		(static_cast<ISampleController*>(c))->setManager(this);
+	}
+
+	int result = app.run();
+
+	delete m_renderer;
+	delete m_physXController;
+	delete m_blastController;
+	delete m_sceneController;
+	delete m_damageToolController;
+	delete m_sampleController;
+	delete m_commonUIController;
+
+	return result;
+}
+
+
+int runSample(const SampleConfig& config)
+{
+	SampleManager sampleManager(config);
+	return sampleManager.run();
 }
 \ No newline at end of file
diff --git a/samples/SampleBase/core/SampleManager.h b/samples/SampleBase/core/SampleManager.h
index 8edf68a..6e3fc1f 100644..100755
--- a/samples/SampleBase/core/SampleManager.h
+++ b/samples/SampleBase/core/SampleManager.h
@@ -1,129 +1,129 @@
-// 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-2018 NVIDIA Corporation. All rights reserved.
-
-
-#ifndef SAMPLE_MANAGER_H
-#define SAMPLE_MANAGER_H
-
-#include "Application.h"
-#include "Sample.h"
-
-
-class SampleManager;
-
-class ISampleController : public IApplicationController
-{
-public:
-
-	void setManager(SampleManager* manager)
-	{
-		m_manager = manager;
-	}
-protected:
-
-	SampleManager* getManager() const
-	{
-		return m_manager;
-	}
-
-private:
-	SampleManager* m_manager;
-};
-
-
-class Renderer;
-class PhysXController;
-class BlastController;
-class SceneController;
-class DamageToolController;
-class SampleController;
-class CommonUIController;
-
-
-/**
-*/
-class SampleManager
-{
-  public:
-	SampleManager(const SampleConfig& config);
-	int run();
-
-	Renderer& getRenderer()
-	{
-		return *m_renderer;
-	}
-
-	PhysXController& getPhysXController() const
-	{
-		return *m_physXController;
-	}
-
-	BlastController& getBlastController() const
-	{
-		return *m_blastController;
-	}
-
-	SceneController& getSceneController() const
-	{
-		return *m_sceneController;
-	}
-
-	DamageToolController& getDamageToolController() const
-	{
-		return *m_damageToolController;
-	}
-
-	SampleController& getSampleController() const
-	{
-		return *m_sampleController;
-	}
-
-	CommonUIController& getCommonUIController() const
-	{
-		return *m_commonUIController;
-	}
-
-	const SampleConfig&	getConfig() const
-	{
-		return m_config;
-	}
-
-
-  private:
-	  Renderer*             m_renderer;
-	  PhysXController*      m_physXController;
-	  BlastController*      m_blastController;
-	  SceneController*      m_sceneController;
-	  DamageToolController* m_damageToolController;
-	  SampleController*     m_sampleController;
-	  CommonUIController*   m_commonUIController;
-
-	  const SampleConfig&	m_config;
-};
-
-
+// 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-2018 NVIDIA Corporation. All rights reserved.
+
+
+#ifndef SAMPLE_MANAGER_H
+#define SAMPLE_MANAGER_H
+
+#include "Application.h"
+#include "Sample.h"
+
+
+class SampleManager;
+
+class ISampleController : public IApplicationController
+{
+public:
+
+	void setManager(SampleManager* manager)
+	{
+		m_manager = manager;
+	}
+protected:
+
+	SampleManager* getManager() const
+	{
+		return m_manager;
+	}
+
+private:
+	SampleManager* m_manager;
+};
+
+
+class Renderer;
+class PhysXController;
+class BlastController;
+class SceneController;
+class DamageToolController;
+class SampleController;
+class CommonUIController;
+
+
+/**
+*/
+class SampleManager
+{
+  public:
+	SampleManager(const SampleConfig& config);
+	int run();
+
+	Renderer& getRenderer()
+	{
+		return *m_renderer;
+	}
+
+	PhysXController& getPhysXController() const
+	{
+		return *m_physXController;
+	}
+
+	BlastController& getBlastController() const
+	{
+		return *m_blastController;
+	}
+
+	SceneController& getSceneController() const
+	{
+		return *m_sceneController;
+	}
+
+	DamageToolController& getDamageToolController() const
+	{
+		return *m_damageToolController;
+	}
+
+	SampleController& getSampleController() const
+	{
+		return *m_sampleController;
+	}
+
+	CommonUIController& getCommonUIController() const
+	{
+		return *m_commonUIController;
+	}
+
+	const SampleConfig&	getConfig() const
+	{
+		return m_config;
+	}
+
+
+  private:
+	  Renderer*             m_renderer;
+	  PhysXController*      m_physXController;
+	  BlastController*      m_blastController;
+	  SceneController*      m_sceneController;
+	  DamageToolController* m_damageToolController;
+	  SampleController*     m_sampleController;
+	  CommonUIController*   m_commonUIController;
+
+	  const SampleConfig&	m_config;
+};
+
+
 #endif
 \ No newline at end of file
author	Bryan Galdrikian <[email protected]>	2018-05-31 11:36:08 -0700
committer	Bryan Galdrikian <[email protected]>	2018-05-31 11:36:08 -0700
commit	7115f60b91b5717d90f643fd692010905c7004db (patch)
tree	effd68c6978751c517d54c2f2bb5bb6e7dc93e18 /samples/SampleBase/core
parent	Updating BlastTool zip (diff)
download	blast-7115f60b91b5717d90f643fd692010905c7004db.tar.xz blast-7115f60b91b5717d90f643fd692010905c7004db.zip