From 6ad135adcf100beb49ef380f2b93a7d234ddb719 Mon Sep 17 00:00:00 2001
From: Egor Yusov <egor.yusov@gmail.com>
Date: Sun, 1 Apr 2018 14:57:12 -0700
Subject: Fixed issue left after intergrating master

---
 Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h       |  8 ++++++--
 Graphics/GraphicsEngineVulkan/include/VulkanErrors.h          |  4 ++--
 Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp         | 11 ++++++++++-
 .../GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp  |  8 ++++----
 4 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'Graphics/GraphicsEngineVulkan')

diff --git a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
index 72006ccc..7b543619 100644
--- a/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
+++ b/Graphics/GraphicsEngineVulkan/include/SwapChainVkImpl.h
@@ -49,8 +49,12 @@ public:
 
     virtual void QueryInterface( const Diligent::INTERFACE_ID &IID, IObject **ppInterface );
 
-    virtual void Present();
-    virtual void Resize( Uint32 NewWidth, Uint32 NewHeight );
+    virtual void Present(Uint32 SyncInterval)override final;
+    virtual void Resize( Uint32 NewWidth, Uint32 NewHeight )override final;
+
+    virtual void SetFullscreenMode(const DisplayModeAttribs &DisplayMode)override final;
+
+    virtual void SetWindowedMode()override final;
 
 /*
     virtual IDXGISwapChain* GetDXGISwapChain()override final{ return m_pSwapChain; }
diff --git a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
index d93c930b..bbb42c09 100644
--- a/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
+++ b/Graphics/GraphicsEngineVulkan/include/VulkanErrors.h
@@ -31,7 +31,7 @@
 {                                       \
     if( err < 0 )                       \
     {                                   \
-        LogError<false>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error: ", VulkanUtilities::VkResultToString(err)); \
+        Diligent::LogError<false>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error: ", VulkanUtilities::VkResultToString(err)); \
         UNEXPECTED("Error");            \
     }                                   \
 }
@@ -39,5 +39,5 @@
 #define CHECK_VK_ERROR_AND_THROW(err, ...)\
 {                                       \
     if( err < 0 )                       \
-        LogError<true>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error Code: ", VulkanUtilities::VkResultToString(err)); \
+        Diligent::LogError<true>(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__, "\nVK Error Code: ", VulkanUtilities::VkResultToString(err)); \
 }
diff --git a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
index a85f23aa..30543134 100644
--- a/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/SwapChainVkImpl.cpp
@@ -394,7 +394,7 @@ void SwapChainVkImpl::InitBuffersAndViews()
 IMPLEMENT_QUERY_INTERFACE( SwapChainVkImpl, IID_SwapChainVk, TSwapChainBase )
 
 
-void SwapChainVkImpl::Present()
+void SwapChainVkImpl::Present(Uint32 SyncInterval)
 {
 #if 0
     UINT SyncInterval = 0;
@@ -498,4 +498,13 @@ ITextureViewVk *SwapChainVkImpl::GetCurrentBackBufferRTV()
 }
 #endif
 
+void SwapChainVkImpl::SetFullscreenMode(const DisplayModeAttribs &DisplayMode)
+{
+}
+
+void SwapChainVkImpl::SetWindowedMode()
+{
+}
+
+
 }
diff --git a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
index 4a3cd749..dabeef91 100644
--- a/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/VulkanUtilities/VulkanDebug.cpp
@@ -59,13 +59,13 @@ namespace VulkanUtilities
 
         debugMessage << " [" << pLayerPrefix << "] Code " << msgCode << "\n" << pMsg << std::endl;
 
-        BasicPlatformDebug::DebugMessageSeverity MsgSeverity = BasicPlatformDebug::DebugMessageSeverity::Info;
+        Diligent::DebugMessageSeverity MsgSeverity = Diligent::DebugMessageSeverity::Info;
         if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT)
-            MsgSeverity = BasicPlatformDebug::DebugMessageSeverity::Error;
+            MsgSeverity = Diligent::DebugMessageSeverity::Error;
         else if (flags & VK_DEBUG_REPORT_WARNING_BIT_EXT)
-            MsgSeverity = BasicPlatformDebug::DebugMessageSeverity::Warning;
+            MsgSeverity = Diligent::DebugMessageSeverity::Warning;
         else
-            MsgSeverity = BasicPlatformDebug::DebugMessageSeverity::Info;
+            MsgSeverity = Diligent::DebugMessageSeverity::Info;
         LOG_DEBUG_MESSAGE(MsgSeverity, debugMessage.str().c_str());
 
         // The return value of this callback controls wether the Vulkan call that caused
-- 
cgit v1.2.3