diff options
author | dan sinclair <dj2@everburning.com> | 2019-01-09 12:02:44 -0500 |
---|---|---|
committer | Jaebaek Seo <duke.acacia@gmail.com> | 2019-01-09 12:02:44 -0500 |
commit | 00ed2a75eb7b8b018a6a06973067d2871319675c (patch) | |
tree | 11d72c7c8b0d951165a5bb0d459479cd78d4a3c9 /samples | |
parent | bae92c4190dccf91f7285271ccb0d8f1254e6b48 (diff) | |
download | amber-00ed2a75eb7b8b018a6a06973067d2871319675c.tar.gz |
Fixup build warnings (#214)
Fixes up issue with returning an EngineConfig unique_ptr but
creating a VulkanEngineConfig unique pointer warnings.
Diffstat (limited to 'samples')
-rw-r--r-- | samples/config_helper_vulkan.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/samples/config_helper_vulkan.cc b/samples/config_helper_vulkan.cc index 2fb0379..625d665 100644 --- a/samples/config_helper_vulkan.cc +++ b/samples/config_helper_vulkan.cc @@ -18,8 +18,6 @@ #include <cassert> #include <set> -#include "src/make_unique.h" - namespace sample { namespace { @@ -639,9 +637,6 @@ void ConfigHelperVulkan::CreateVulkanDevice( std::unique_ptr<amber::EngineConfig> ConfigHelperVulkan::CreateConfig( const std::vector<std::string>& required_features, const std::vector<std::string>& required_extensions) { - std::unique_ptr<amber::VulkanEngineConfig> config = - amber::MakeUnique<amber::VulkanEngineConfig>(); - auto required_vulkan_features = NamesToVulkanFeatures(required_features); CreateVulkanInstance(); @@ -650,13 +645,17 @@ std::unique_ptr<amber::EngineConfig> ConfigHelperVulkan::CreateConfig( vkGetDeviceQueue(vulkan_device_, vulkan_queue_family_index_, 0, &vulkan_queue_); + std::unique_ptr<amber::EngineConfig> cfg_holder = + std::unique_ptr<amber::EngineConfig>(new amber::VulkanEngineConfig()); + amber::VulkanEngineConfig* config = + static_cast<amber::VulkanEngineConfig*>(cfg_holder.get()); config->physical_device = vulkan_physical_device_; config->available_features = available_features_; config->available_extensions = available_extensions_; config->queue_family_index = vulkan_queue_family_index_; config->queue = vulkan_queue_; config->device = vulkan_device_; - return config; + return cfg_holder; } void ConfigHelperVulkan::Shutdown() { |