drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Linux] Vulkan build fixes

Browse Source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk
2025-07-21 23:06:04 +02:00
committed by Konstantin Pastbin
parent 76d8396cb1
commit 33f8e20f1b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dev_sandbox/main_linux.cpp
View File

@@ -12,7 +12,6 @@
#include <X11/X.h> #include <X11/X.h>
#include <vulkan_wrapper.h> #include <vulkan_wrapper.h>
#include <vulkan/vulkan_xlib.h>
// Workaround for TestFunction::Always compilation issue: // Workaround for TestFunction::Always compilation issue:
// /usr/include/X11/X.h:441:33: note: expanded from macro 'Always' // /usr/include/X11/X.h:441:33: note: expanded from macro 'Always'
#undef Always #undef Always

5
libs/drape/vulkan/vulkan_utils.cpp
View File

@@ -1,6 +1,7 @@
#include "drape/vulkan/vulkan_utils.hpp" #include "drape/vulkan/vulkan_utils.hpp"
#include <array> #include <array>
#include <string>
namespace dp namespace dp
{ {
@@ -22,7 +23,7 @@ static bool gUse32bitDepth8bitStencil = false;
void DebugName::Init(VkInstance instance, VkDevice device) void DebugName::Init(VkInstance instance, VkDevice device)
{ {
vkSetDebugUtilsObjectNameEXT = vkSetDebugUtilsObjectNameEXT =
(PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(instance, "vkSetDebugUtilsObjectNameEXT"); (PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(instance, "vkSetDebugUtilsObjectNameEXT");
m_device = device; m_device = device;
} }
@@ -95,6 +96,8 @@ std::string GetVulkanResultString(VkResult result)
case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: return "VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR"; case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: return "VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR";
case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: return "VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR"; case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: return "VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR";
case VK_INCOMPATIBLE_SHADER_BINARY_EXT: return "VK_INCOMPATIBLE_SHADER_BINARY_EXT"; case VK_INCOMPATIBLE_SHADER_BINARY_EXT: return "VK_INCOMPATIBLE_SHADER_BINARY_EXT";
case VK_PIPELINE_BINARY_MISSING_KHR: return "VK_PIPELINE_BINARY_MISSING_KHR";
case VK_ERROR_NOT_ENOUGH_SPACE_KHR: return "VK_ERROR_NOT_ENOUGH_SPACE_KHR";
} }
UNREACHABLE(); UNREACHABLE();
return "Unknown result"; return "Unknown result";