From c55556104937ef5f16c3b8a8df9d940a8d257781 Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Wed, 8 Jan 2020 00:11:05 -0800
Subject: Updated factory functions to not throw exceptions, but return; fixed
 API version mismatch error message

---
 Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Graphics/GraphicsEngineVulkan')

diff --git a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
index b1c91a7d..264eb168 100644
--- a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
+++ b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp
@@ -98,7 +98,10 @@ void EngineFactoryVkImpl::CreateDeviceAndContextsVk(const EngineVkCreateInfo& _E
         SetDebugMessageCallback(_EngineCI.DebugMessageCallback);
 
     if (_EngineCI.APIVersion != DILIGENT_API_VERSION)
-        LOG_ERROR_AND_THROW("Diligent Engine runtime (", _EngineCI.APIVersion, ") is not compatible with the client API version (", DILIGENT_API_VERSION, ")");
+    {
+        LOG_ERROR_MESSAGE("Diligent Engine runtime (", DILIGENT_API_VERSION, ") is not compatible with the client API version (", _EngineCI.APIVersion, ")");
+        return;
+    }
 
     VERIFY(ppDevice && ppContexts, "Null pointer provided");
     if (!ppDevice || !ppContexts)
@@ -254,7 +257,10 @@ void EngineFactoryVkImpl::AttachToVulkanDevice(std::shared_ptr<VulkanUtilities::
         SetDebugMessageCallback(EngineCI.DebugMessageCallback);
 
     if (EngineCI.APIVersion != DILIGENT_API_VERSION)
-        LOG_ERROR_AND_THROW("Diligent Engine runtime (", EngineCI.APIVersion, ") is not compatible with the client API version (", DILIGENT_API_VERSION, ")");
+    {
+        LOG_ERROR_MESSAGE("Diligent Engine runtime (", DILIGENT_API_VERSION, ") is not compatible with the client API version (", EngineCI.APIVersion, ")");
+        return;
+    }
 
     VERIFY(ppCommandQueues && ppDevice && ppContexts, "Null pointer provided");
     if (!LogicalDevice || !ppCommandQueues || !ppDevice || !ppContexts)
-- 
cgit v1.2.3