From 6d2461cfc1e984bbe614a52853fe0ced578294a8 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 14 Feb 2019 12:16:06 +0300 Subject: [PATCH] Review fixes --- drape/drape_global.hpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drape/drape_global.hpp b/drape/drape_global.hpp index 9b4ff132b2..1b84e2b48c 100644 --- a/drape/drape_global.hpp +++ b/drape/drape_global.hpp @@ -103,21 +103,15 @@ inline std::string DebugPrint(dp::ApiVersion apiVersion) inline dp::ApiVersion ApiVersionFromString(std::string const & str) { +#if defined(OMIM_METAL_AVAILABLE) if (str == "Metal") - { -#if defined(OMIM_OS_ANDROID) - return dp::ApiVersion::Vulkan; -#endif return dp::ApiVersion::Metal; - } +#endif +#if defined(OMIM_OS_ANDROID) if (str == "Vulkan") - { -#if defined(OMIM_OS_IPHONE) - return dp::ApiVersion::Metal; -#endif return dp::ApiVersion::Vulkan; - } +#endif if (str == "OpenGLES2") return dp::ApiVersion::OpenGLES2; @@ -127,7 +121,7 @@ inline dp::ApiVersion ApiVersionFromString(std::string const & str) // Default behavior for different OS. Appropriate fallback will be chosen // if default API is not supported. -#if defined(OMIM_OS_IPHONE) +#if defined(OMIM_METAL_AVAILABLE) return dp::ApiVersion::Metal; #elif defined(OMIM_OS_ANDROID) //TODO(@rokuz,@darina): Uncomment on full laucnch of Vulkan.