From 5aaeeaae93149b8e2845ed9a4ed0958c93924bc1 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Thu, 18 Mar 2021 17:41:05 -0700
Subject: Fixed rebase issues; updated API to version 240083

---
 Graphics/GraphicsEngine/interface/APIInfo.h                             | 2 +-
 Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'Graphics')

diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h
index f268ff63..288ccff0 100644
--- a/Graphics/GraphicsEngine/interface/APIInfo.h
+++ b/Graphics/GraphicsEngine/interface/APIInfo.h
@@ -30,7 +30,7 @@
 /// \file
 /// Diligent API information
 
-#define DILIGENT_API_VERSION 240082
+#define DILIGENT_API_VERSION 240083
 
 #include "../../../Primitives/interface/BasicTypes.h"
 
diff --git a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp
index 173060fa..30d13ec8 100644
--- a/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp
+++ b/Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp
@@ -27,6 +27,8 @@
 
 #pragma once
 
+#include <atomic>
+
 #include "BasicTypes.h"
 #include "ReferenceCounters.h"
 #include "RefCntAutoPtr.hpp"
-- 
cgit v1.2.3