diff options
| author | JosJuice <josjuice@gmail.com> | 2023-02-17 16:49:02 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2023-02-17 16:58:24 +0100 |
| commit | 90b676d3681286b9e92db6214e65053e4f4dbbcf (patch) | |
| tree | eff0f8cbee0ca867eeb73ca01ee0c1a0a3dd5aca /Source/Core/VideoBackends | |
| parent | 661b74f4a3d9fee4acf80b4e399a6c45e1f21fa3 (diff) | |
Android: Fix armeabi-v7a build
This very much isn't a build configuration that we're going to ship,
but I want to be able to tell people that they can build it on their
own if they really want to see how terribly it performs :)
Just like before, you'll need to edit two lines in app/build.gradle to
define ENABLE_GENERIC=ON and actually enable armeabi-v7a if you want an
armeabi-v7a build. This commit just fixes some compilations errors that
crop up if you do so.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/VKTexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp index b1c3c122a8..14b33d2376 100644 --- a/Source/Core/VideoBackends/Vulkan/VKTexture.cpp +++ b/Source/Core/VideoBackends/Vulkan/VKTexture.cpp @@ -780,7 +780,7 @@ std::pair<VkImage, VmaAllocation> VKStagingTexture::CreateLinearImage(StagingTex if (res != VK_SUCCESS) { LOG_VULKAN_ERROR(res, "Linear images are not supported for the staging texture: "); - return std::make_pair(VK_NULL_HANDLE, VK_NULL_HANDLE); + return std::make_pair<VkImage, VmaAllocation>(VK_NULL_HANDLE, VK_NULL_HANDLE); } VmaAllocationCreateInfo alloc_create_info = {}; @@ -799,7 +799,7 @@ std::pair<VkImage, VmaAllocation> VKStagingTexture::CreateLinearImage(StagingTex if (res != VK_SUCCESS) { LOG_VULKAN_ERROR(res, "vmaCreateImage failed: "); - return std::make_pair(VK_NULL_HANDLE, VK_NULL_HANDLE); + return std::make_pair<VkImage, VmaAllocation>(VK_NULL_HANDLE, VK_NULL_HANDLE); } return std::make_pair(image, alloc); } |