From dadb44ef46cb83a957507a1d2d5d20986b3cec22 Mon Sep 17 00:00:00 2001 From: Robert Campbell Date: Thu, 30 Jan 2020 04:39:19 -0500 Subject: Introduced NativeWindow wrapper for supported platforms --- Graphics/GraphicsEngine/interface/GraphicsTypes.h | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/interface/GraphicsTypes.h b/Graphics/GraphicsEngine/interface/GraphicsTypes.h index 913d5e61..398358f8 100644 --- a/Graphics/GraphicsEngine/interface/GraphicsTypes.h +++ b/Graphics/GraphicsEngine/interface/GraphicsTypes.h @@ -35,6 +35,7 @@ #include "../../../Primitives/interface/BasicTypes.h" #include "../../../Primitives/interface/DebugOutput.h" #include "../../../Primitives/interface/FlagEnum.h" +#include "../../../Platforms/interface/NativeWindow.h" #include "APIInfo.h" /// Graphics engine namespace @@ -1318,21 +1319,11 @@ struct EngineCreateInfo }; typedef struct EngineCreateInfo EngineCreateInfo; - /// Attributes of the OpenGL-based engine implementation struct EngineGLCreateInfo DILIGENT_DERIVE(EngineCreateInfo) - /// Native window handle - - /// * On Win32 platform, this is a window handle (HWND) - /// * On Android platform, this is a pointer to the native window (ANativeWindow*) - /// * On Linux, this is the native window (Window) - void* pNativeWndHandle DEFAULT_INITIALIZER(nullptr); - -#if PLATFORM_LINUX - /// For linux platform only, this is the pointer to the display - void* pDisplay DEFAULT_INITIALIZER(nullptr); -#endif + /// Native window wrapper + NativeWindow Window; }; typedef struct EngineGLCreateInfo EngineGLCreateInfo; -- cgit v1.2.3