From c87e69d08937a012ed00d9c5395b942a8f6de9b1 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Tue, 5 Mar 2019 23:40:05 -0800 Subject: Fixed swap chain build error on iOS --- Graphics/GraphicsEngineOpenGL/include/SwapChainGLIOS.h | 11 +++++------ Graphics/GraphicsEngineOpenGL/src/SwapChainGLIOS.mm | 11 +++++------ Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp | 10 +++++----- 3 files changed, 15 insertions(+), 17 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLIOS.h b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLIOS.h index 51d34a47..db321e70 100644 --- a/Graphics/GraphicsEngineOpenGL/include/SwapChainGLIOS.h +++ b/Graphics/GraphicsEngineOpenGL/include/SwapChainGLIOS.h @@ -23,7 +23,6 @@ #pragma once -#include "EngineGLAttribs.h" #include "SwapChainGL.h" #include "SwapChainBase.h" #include "GLObjectWrapper.h" @@ -38,11 +37,11 @@ class SwapChainGLIOS final : public SwapChainBase public: typedef SwapChainBase TSwapChainBase; - SwapChainGLIOS(IReferenceCounters *pRefCounters, - const EngineGLAttribs &InitAttribs, - const SwapChainDesc& SwapChainDesc, - class RenderDeviceGLImpl* pRenderDeviceGL, - class DeviceContextGLImpl* pImmediateContextGL); + SwapChainGLIOS(IReferenceCounters* pRefCounters, + const EngineGLCreateInfo& InitAttribs, + const SwapChainDesc& SwapChainDesc, + class RenderDeviceGLImpl* pRenderDeviceGL, + class DeviceContextGLImpl* pImmediateContextGL); SwapChainGLIOS(); virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface )override final; diff --git a/Graphics/GraphicsEngineOpenGL/src/SwapChainGLIOS.mm b/Graphics/GraphicsEngineOpenGL/src/SwapChainGLIOS.mm index 679ea021..7e285249 100644 --- a/Graphics/GraphicsEngineOpenGL/src/SwapChainGLIOS.mm +++ b/Graphics/GraphicsEngineOpenGL/src/SwapChainGLIOS.mm @@ -30,15 +30,14 @@ #include "DeviceContextGLImpl.h" #include "RenderDeviceGLImpl.h" #include "SwapChainGLIOS.h" -#include "EngineGLAttribs.h" namespace Diligent { -SwapChainGLIOS::SwapChainGLIOS(IReferenceCounters *pRefCounters, - const EngineGLAttribs &InitAttribs, - const SwapChainDesc& SCDesc, - RenderDeviceGLImpl* pRenderDeviceGL, - DeviceContextGLImpl* pImmediateContextGL) : +SwapChainGLIOS::SwapChainGLIOS(IReferenceCounters* pRefCounters, + const EngineGLCreateInfo& InitAttribs, + const SwapChainDesc& SCDesc, + RenderDeviceGLImpl* pRenderDeviceGL, + DeviceContextGLImpl* pImmediateContextGL) : TSwapChainBase( pRefCounters, pRenderDeviceGL, pImmediateContextGL, SCDesc), m_ColorRenderBuffer(false), m_DepthRenderBuffer(false), diff --git a/Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp b/Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp index 9fb44c53..01f1e5ec 100644 --- a/Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/SwapChainGLImpl.cpp @@ -28,11 +28,11 @@ namespace Diligent { -SwapChainGLImpl::SwapChainGLImpl(IReferenceCounters *pRefCounters, - const EngineGLCreateInfo &InitAttribs, - const SwapChainDesc& SCDesc, - RenderDeviceGLImpl* pRenderDeviceGL, - DeviceContextGLImpl* pImmediateContextGL) : +SwapChainGLImpl::SwapChainGLImpl(IReferenceCounters* pRefCounters, + const EngineGLCreateInfo& InitAttribs, + const SwapChainDesc& SCDesc, + RenderDeviceGLImpl* pRenderDeviceGL, + DeviceContextGLImpl* pImmediateContextGL) : TSwapChainBase( pRefCounters, pRenderDeviceGL, pImmediateContextGL, SCDesc) { #if PLATFORM_WIN32 -- cgit v1.2.3