summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngine
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-12-06 06:31:26 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-12-06 06:31:26 +0000
commitc4a10aae14aafadc267bb32a2edb53185ced008f (patch)
treefaeb815b35550d65386bf06955686a82483a501c /Graphics/GraphicsEngine
parentAdded PlatformMisc and StringTools tests (diff)
downloadDiligentCore-c4a10aae14aafadc267bb32a2edb53185ced008f.tar.gz
DiligentCore-c4a10aae14aafadc267bb32a2edb53185ced008f.zip
Added ADAPTER_TYPE enum and AdapterType member to AdapterAttribs struct (API version 240043)
Diffstat (limited to 'Graphics/GraphicsEngine')
-rw-r--r--Graphics/GraphicsEngine/interface/APIInfo.h4
-rw-r--r--Graphics/GraphicsEngine/interface/GraphicsTypes.h20
-rw-r--r--Graphics/GraphicsEngine/src/APIInfo.cpp2
3 files changed, 21 insertions, 5 deletions
diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h
index 866a7693..1e8a74b4 100644
--- a/Graphics/GraphicsEngine/interface/APIInfo.h
+++ b/Graphics/GraphicsEngine/interface/APIInfo.h
@@ -26,7 +26,7 @@
/// \file
/// Diligent API information
-#define DILIGENT_API_VERSION 240042
+#define DILIGENT_API_VERSION 240043
#include "../../../Primitives/interface/BasicTypes.h"
@@ -55,7 +55,7 @@ struct APIInfo
size_t RectSize = 0;
size_t CopyTextureAttribsSize = 0;
size_t DeviceObjectAttribsSize = 0;
- size_t HardwareAdapterAttribsSize = 0;
+ size_t AdapterAttribsSize = 0;
size_t DisplayModeAttribsSize = 0;
size_t SwapChainDescSize = 0;
size_t FullScreenModeDescSize = 0;
diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
index da4152c4..859eaf2f 100644
--- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h
+++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h
@@ -1084,10 +1084,26 @@ namespace Diligent
Name{_Name}
{}
};
+
+ /// Hardware adapter type
+ enum ADAPTER_TYPE : Uint8
+ {
+ /// Adapter type is unknown
+ ADAPTER_TYPE_UNKNOWN = 0,
+
+ /// Software adapter
+ ADAPTER_TYPE_SOFTWARE,
- /// Hardware adapter attributes
- struct HardwareAdapterAttribs
+ /// Hardware adapter
+ ADAPTER_TYPE_HARDWARE
+ };
+
+ /// Adapter attributes
+ struct AdapterAttribs
{
+ /// Adapter type. See Diligent::ADAPTER_TYPE.
+ ADAPTER_TYPE AdapterType = ADAPTER_TYPE_UNKNOWN;
+
/// A string that contains the adapter description
char Description[128] = {};
diff --git a/Graphics/GraphicsEngine/src/APIInfo.cpp b/Graphics/GraphicsEngine/src/APIInfo.cpp
index c50b1863..51c824ac 100644
--- a/Graphics/GraphicsEngine/src/APIInfo.cpp
+++ b/Graphics/GraphicsEngine/src/APIInfo.cpp
@@ -64,7 +64,7 @@ static APIInfo InitAPIInfo()
INIT_STRUCTURE_SIZE(Rect);
INIT_STRUCTURE_SIZE(CopyTextureAttribs);
INIT_STRUCTURE_SIZE(DeviceObjectAttribs);
- INIT_STRUCTURE_SIZE(HardwareAdapterAttribs);
+ INIT_STRUCTURE_SIZE(AdapterAttribs);
INIT_STRUCTURE_SIZE(DisplayModeAttribs);
INIT_STRUCTURE_SIZE(SwapChainDesc);
INIT_STRUCTURE_SIZE(FullScreenModeDesc);