From e388323677072a6df205c258b09f8807e2c3d22c Mon Sep 17 00:00:00 2001
From: Dmitry Duka <dduka@nvidia.com>
Date: Fri, 30 Jun 2017 01:37:37 +0400
Subject: Pulling latest Ansel SDK 1.4 into master

---
 samples/AnselSDKDelayLoader/source/DelayLoader.cpp | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'samples/AnselSDKDelayLoader/source/DelayLoader.cpp')

diff --git a/samples/AnselSDKDelayLoader/source/DelayLoader.cpp b/samples/AnselSDKDelayLoader/source/DelayLoader.cpp
index 1445260..362c63a 100644
--- a/samples/AnselSDKDelayLoader/source/DelayLoader.cpp
+++ b/samples/AnselSDKDelayLoader/source/DelayLoader.cpp
@@ -51,15 +51,15 @@ namespace ansel
         typedef void(__cdecl *PFNUPDATECAMERA)(Camera& camera);
         typedef void(__cdecl *PFNSESSIONFUNC)();
         typedef bool(__cdecl *PFNISANSELAVAILABLE)();
-        typedef void(__cdecl *PFNMARKHDRBUFFERBIND)(HintType, uint64_t);
-        typedef void(__cdecl *PFNMARKHDRBUFFERFINISHED)(uint64_t);
+        typedef void(__cdecl *PFNMARKBUFFERBIND)(BufferType, HintType, uint64_t);
+        typedef void(__cdecl *PFNMARKBUFFERFINISHED)(BufferType, uint64_t);
         typedef UserControlStatus(__cdecl *PFNADDUSERCONTROL)(const UserControlDesc&);
         typedef UserControlStatus(__cdecl *PFNSETUSERCONTROLLABELLOCALIZATION)(uint32_t, const char*, const char*);
         typedef UserControlStatus(__cdecl *PFNREMOVEUSERCONTROL)(uint32_t);
         typedef UserControlStatus(__cdecl *PFNGETUSERCONTROLVALUE)(uint32_t, void*);
 
-        PFNMARKHDRBUFFERFINISHED markHdrBufferFinishedFunc = nullptr;
-        PFNMARKHDRBUFFERBIND markHdrBufferBindFunc = nullptr;
+        PFNMARKBUFFERFINISHED markBufferFinishedFunc = nullptr;
+        PFNMARKBUFFERBIND markBufferBindFunc = nullptr;
         PFNSESSIONFUNC stopSessionFunc = nullptr;
         PFNSESSIONFUNC startSessionFunc = nullptr;
         PFNUPDATECAMERA updateCameraFunc = nullptr;
@@ -78,8 +78,8 @@ namespace ansel
             stopSessionFunc = reinterpret_cast<PFNSESSIONFUNC>(GetProcAddress(anselSDK, "stopSession"));
             startSessionFunc = reinterpret_cast<PFNSESSIONFUNC>(GetProcAddress(anselSDK, "startSession"));
             updateCameraFunc = reinterpret_cast<PFNUPDATECAMERA>(GetProcAddress(anselSDK, "updateCamera"));
-            markHdrBufferBindFunc = reinterpret_cast<PFNMARKHDRBUFFERBIND>(GetProcAddress(anselSDK, "markHdrBufferBind"));
-            markHdrBufferFinishedFunc = reinterpret_cast<PFNMARKHDRBUFFERFINISHED>(GetProcAddress(anselSDK, "markHdrBufferFinished"));
+            markBufferBindFunc = reinterpret_cast<PFNMARKBUFFERBIND>(GetProcAddress(anselSDK, "markBufferBind"));
+            markBufferFinishedFunc = reinterpret_cast<PFNMARKBUFFERFINISHED>(GetProcAddress(anselSDK, "markBufferFinished"));
             addUserControlFunc = reinterpret_cast<PFNADDUSERCONTROL>(GetProcAddress(anselSDK, "addUserControl"));
             setUserControlLabelLocalizationFunc = reinterpret_cast<PFNSETUSERCONTROLLABELLOCALIZATION>(GetProcAddress(anselSDK, "setUserControlLabelLocalization"));
             removeUserControlFunc = reinterpret_cast<PFNREMOVEUSERCONTROL>(GetProcAddress(anselSDK, "removeUserControl"));
@@ -89,8 +89,8 @@ namespace ansel
                 stopSessionFunc == nullptr ||
                 startSessionFunc == nullptr ||
                 updateCameraFunc == nullptr ||
-                markHdrBufferBindFunc == nullptr ||
-                markHdrBufferFinishedFunc == nullptr ||
+                markBufferBindFunc == nullptr ||
+                markBufferFinishedFunc == nullptr ||
                 addUserControlFunc == nullptr ||
                 setUserControlLabelLocalizationFunc == nullptr ||
                 removeUserControlFunc == nullptr ||
@@ -228,16 +228,16 @@ namespace ansel
         return GetModuleHandleA(moduleName) != nullptr;
     }
 
-    void markHdrBufferBind(HintType hintType, uint64_t threadId)
+    void markBufferBind(BufferType bufferType, HintType hintType, uint64_t threadId)
     { 
-        if (markHdrBufferBindFunc)
-            markHdrBufferBindFunc(hintType, threadId);
+        if (markBufferBindFunc)
+            markBufferBindFunc(bufferType, hintType, threadId);
     }
     
-    void markHdrBufferFinished(uint64_t threadId)
+    void markBufferFinished(BufferType bufferType, uint64_t threadId)
     {
-        if (markHdrBufferFinishedFunc)
-            markHdrBufferFinishedFunc(threadId);
+        if (markBufferFinishedFunc)
+            markBufferFinishedFunc(bufferType, threadId);
     }
 
     void quaternionToRotationMatrixVectors(const nv::Quat& q, nv::Vec3& right, nv::Vec3& up, nv::Vec3& forward)
-- 
cgit v1.2.3