diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2023-02-17 17:57:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-17 17:57:38 +0100 |
| commit | b381df700c8d9c958be3223e1131761eb38529d6 (patch) | |
| tree | a3d71c7ddfa5c9e92bc9889190f7d40a7ed257ce /Source/Core/VideoBackends/Vulkan/VKTexture.cpp | |
| parent | 28331c5905aa85c526a51c77f7128682eedd975d (diff) | |
| parent | 90b676d3681286b9e92db6214e65053e4f4dbbcf (diff) | |
Merge pull request #11577 from JosJuice/android-armeabi-v7a
Android: Fix armeabi-v7a build
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/VKTexture.cpp')
| -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); } |