From 2acf905be6c44925dd1e2831d3175964f61f41cc Mon Sep 17 00:00:00 2001 From: assiduous Date: Wed, 10 Jun 2020 08:38:37 -0700 Subject: Tweak EngineCreateInfo layout to fix c++11 vs c++17 member alignment issues (API version 24062) --- Graphics/GraphicsEngine/interface/APIInfo.h | 2 +- Graphics/GraphicsEngine/interface/GraphicsTypes.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/interface/APIInfo.h b/Graphics/GraphicsEngine/interface/APIInfo.h index 0274a2b2..c86914dc 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 240061 +#define DILIGENT_API_VERSION 240062 #include "../../../Primitives/interface/BasicTypes.h" diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index ecce27ba..ece12fea 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -1351,21 +1351,21 @@ typedef struct FullScreenModeDesc FullScreenModeDesc; struct EngineCreateInfo { /// API version number. - Int32 APIVersion DEFAULT_INITIALIZER(DILIGENT_API_VERSION); - - /// Pointer to the raw memory allocator that will be used for all memory allocation/deallocation - /// operations in the engine - struct IMemoryAllocator* pRawMemAllocator DEFAULT_INITIALIZER(nullptr); - - /// Pointer to the user-specified debug message callback function - DebugMessageCallbackType DebugMessageCallback DEFAULT_INITIALIZER(nullptr); + Int32 APIVersion DEFAULT_INITIALIZER(DILIGENT_API_VERSION); /// Number of deferred contexts to create when initializing the engine. If non-zero number /// is given, pointers to the contexts are written to ppContexts array by the engine factory /// functions (IEngineFactoryD3D11::CreateDeviceAndContextsD3D11, /// IEngineFactoryD3D12::CreateDeviceAndContextsD3D12, and IEngineFactoryVk::CreateDeviceAndContextsVk) /// starting at position 1. - Uint32 NumDeferredContexts DEFAULT_INITIALIZER(0); + Uint32 NumDeferredContexts DEFAULT_INITIALIZER(0); + + /// Pointer to the raw memory allocator that will be used for all memory allocation/deallocation + /// operations in the engine + struct IMemoryAllocator* pRawMemAllocator DEFAULT_INITIALIZER(nullptr); + + /// Pointer to the user-specified debug message callback function + DebugMessageCallbackType DebugMessageCallback DEFAULT_INITIALIZER(nullptr); }; typedef struct EngineCreateInfo EngineCreateInfo; -- cgit v1.2.3