From 14179f7565b0f7d430aaa9c4ed2d0b5438c30d80 Mon Sep 17 00:00:00 2001 From: Minty-Meeo <45425365+Minty-Meeo@users.noreply.github.com> Date: Thu, 22 Dec 2022 19:54:46 -0600 Subject: [PATCH] Follow-up on a four-year-old Android NDK workaround Surely this is fixed by now. --- Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp index 146eb2921e..be9e22d4d5 100644 --- a/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKVertexManager.cpp @@ -3,6 +3,8 @@ #include "VideoBackends/Vulkan/VKVertexManager.h" +#include + #include "Common/Align.h" #include "Common/CommonTypes.h" #include "Common/Logging/Log.h" @@ -87,11 +89,9 @@ bool VertexManager::Initialize() // Prefer an 8MB buffer if possible, but use less if the device doesn't support this. // This buffer is potentially going to be addressed as R8s in the future, so we assume - // that one element is one byte. This doesn't use min() because of a NDK compiler bug.. - const u32 texel_buffer_size = - TEXEL_STREAM_BUFFER_SIZE > g_vulkan_context->GetDeviceLimits().maxTexelBufferElements ? - g_vulkan_context->GetDeviceLimits().maxTexelBufferElements : - TEXEL_STREAM_BUFFER_SIZE; + // that one element is one byte. + const u32 texel_buffer_size = std::min( + TEXEL_STREAM_BUFFER_SIZE, g_vulkan_context->GetDeviceLimits().maxTexelBufferElements); m_texel_stream_buffer = StreamBuffer::Create(VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT, texel_buffer_size); if (!m_texel_stream_buffer)