diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:41:05 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 01:52:37 +0000 |
| commit | 5aaeeaae93149b8e2845ed9a4ed0958c93924bc1 (patch) | |
| tree | 0f3151c4e3e1565577cd434cb2ff988d1776a0cb /Graphics | |
| parent | Fixed test failures in d3d12_sw mode due to bugs in WARP (diff) | |
| download | DiligentCore-5aaeeaae93149b8e2845ed9a4ed0958c93924bc1.tar.gz DiligentCore-5aaeeaae93149b8e2845ed9a4ed0958c93924bc1.zip | |
Fixed rebase issues; updated API to version 240083
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngine/interface/APIInfo.h | 2 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineNextGenBase/include/DeviceContextNextGenBase.hpp | 2 |
2 files changed, 3 insertions, 1 deletions
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" |