Pulling latest Ansel SDK 1.4 into masterv1.4.295

3 files changed, 20 insertions, 6 deletions

diff --git a/include/ansel/Hints.h b/include/ansel/Hints.h
index 943482e..915c255 100644
--- a/include/ansel/Hints.h
+++ b/include/ansel/Hints.h
@@ -31,6 +31,14 @@
 
 namespace ansel
 {
+    enum BufferType
+    {
+        kBufferTypeHDR = 0,
+        kBufferTypeDepth,
+        kBufferTypeHUDless,
+        kBufferTypeCount
+    };
+
     enum HintType
     {
         kHintTypePreBind,
@@ -44,6 +52,8 @@ namespace ansel
     };
 
     // Call this right before setting HDR render target active
+    // bufferType is an optional argument specifying what type of buffer is this - 
+    // an HDR color buffer, a depth buffer or HUDless buffer. The default option is HDR color buffer.
     // hintType is an optional argument specifying what type of hint is this -
     // it could be called after or before the bind of a buffer that this hint marks.
     // The default option is kHintTypePreBind, which means the hint should be called before 
@@ -54,14 +64,16 @@ namespace ansel
     // means that no such matching is going to happen. The special value of 0 means that
     // Ansel SDK is going to match thread ids automatically. Any other value means a specific thread id
     // known at integration side.
-    ANSEL_SDK_API void markHdrBufferBind(HintType hintType = kHintTypePreBind, uint64_t threadId = kThreadingBehaviourNoMatching);
+    ANSEL_SDK_API void markBufferBind(BufferType bufferType = kBufferTypeHDR, HintType hintType = kHintTypePreBind, uint64_t threadId = kThreadingBehaviourNoMatching);
     // Call this right after the last draw call into the HDR render target
+    // bufferType is an optional argument specifying what type of buffer is this - 
+    // an HDR color buffer, a depth buffer or HUDless buffer. The default option is HDR color buffer.
     // threadId is an optional argument allowing Ansel to match the thread which calls
     // SetRenderTarget (or analogous function, since this is graphics API dependent)
     // to the thread which called the hint. The default value of kNoMatching
     // means that no such matching is going to happen. The special value of 0 means that
     // Ansel SDK is going to match thread ids automatically. Any other value means a specific thread id
     // known at integration side.
-    ANSEL_SDK_API void markHdrBufferFinished(uint64_t threadId = kThreadingBehaviourNoMatching);
+    ANSEL_SDK_API void markBufferFinished(BufferType bufferType = kBufferTypeHDR, uint64_t threadId = kThreadingBehaviourNoMatching);
 }
 
diff --git a/include/ansel/UserControls.h b/include/ansel/UserControls.h
index 6a78695..1abe8bd 100644
--- a/include/ansel/UserControls.h
+++ b/include/ansel/UserControls.h
@@ -94,4 +94,6 @@ namespace ansel
     ANSEL_SDK_API UserControlStatus removeUserControl(uint32_t userControlId);
     // This function returns the current control value
     ANSEL_SDK_API UserControlStatus getUserControlValue(uint32_t userControlId, void* value);
+    // This function sets the current control value
+    ANSEL_SDK_API UserControlStatus setUserControlValue(uint32_t userControlId, const void* value);
 }
diff --git a/include/ansel/Version.h b/include/ansel/Version.h
index fd8481d..1134c58 100644
--- a/include/ansel/Version.h
+++ b/include/ansel/Version.h
@@ -38,15 +38,15 @@
 // MINIMUM_DRIVER_VERSION as well. While a public driver hasn't been finalized use our internal 
 // release tags to identify it (like 378.GA2).
 #define ANSEL_SDK_PRODUCT_VERSION_MAJOR 1
-#define ANSEL_SDK_PRODUCT_VERSION_MINOR 3
-#define ANSEL_SDK_MINIMUM_DRIVER_VERSION "381.65"
+#define ANSEL_SDK_PRODUCT_VERSION_MINOR 4
+#define ANSEL_SDK_MINIMUM_DRIVER_VERSION "384.76"
 
 // The lines below are automatically updated by build agents. Please don't touch.
 // The BUILD_NUMBER and COMMIT_HASH are useful in uniquely identifying a build of the Ansel SDK.
 // Changes to the customer facing API can be tracked with these since they are automatically 
 // updated every time a change is made.
-#define ANSEL_SDK_BUILD_NUMBER 271
-#define ANSEL_SDK_COMMIT_HASH 0xe8aa77f3
+#define ANSEL_SDK_BUILD_NUMBER 295
+#define ANSEL_SDK_COMMIT_HASH 0xb92d0fac
 
 #define ANSEL_SDK_VERSION ( uint64_t(ANSEL_SDK_PRODUCT_VERSION_MAJOR) << 48 | uint64_t(ANSEL_SDK_PRODUCT_VERSION_MINOR) << 32 \
                            | ANSEL_SDK_COMMIT_HASH )