From 34a4c45a937735adef678742bfc0907bc848df69 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 12 Sep 2020 21:10:08 -0700 Subject: Moved Features member of EngineCreateInfo struct to fix misalignment error on Linux --- Graphics/GraphicsEngine/interface/GraphicsTypes.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index c8514a65..a6dd6a16 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -1757,13 +1757,6 @@ struct EngineCreateInfo /// starting at position 1. 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); - /// Requested device features. /// \remarks If a feature is requested to be enabled, but is not supported @@ -1774,6 +1767,13 @@ struct EngineCreateInfo /// the engine will successfully be initialized, but the feature will be disabled. /// The actual feature state can be queried from DeviceCaps structure. DeviceFeatures Features; + + /// 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