diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-12 14:09:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-12 14:09:42 +0200 |
commit | 9dd1debaf9e89aaeda58e5ca25924e844fbeb248 (patch) | |
tree | 819ab98e058647497a4855cf7c774db49a8af241 /platform/linuxbsd | |
parent | 67fc611bda7b55b3eeab87f683a5c95ea0d0313f (diff) | |
parent | 133f678f85edcb3dbf6890b8394cc790463d7354 (diff) |
Merge pull request #51516 from bruvzg/🐺
Diffstat (limited to 'platform/linuxbsd')
-rw-r--r-- | platform/linuxbsd/detect.py | 2 | ||||
-rw-r--r-- | platform/linuxbsd/vulkan_context_x11.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index eba672ddcb..3e3ed469ed 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -384,7 +384,7 @@ def configure(env): if env["vulkan"]: env.Append(CPPDEFINES=["VULKAN_ENABLED"]) - if not env["builtin_vulkan"]: + if not env["use_volk"]: env.ParseConfig("pkg-config vulkan --cflags --libs") if not env["builtin_glslang"]: # No pkgconfig file for glslang so far diff --git a/platform/linuxbsd/vulkan_context_x11.cpp b/platform/linuxbsd/vulkan_context_x11.cpp index 88cb00a8a1..ebaef984e0 100644 --- a/platform/linuxbsd/vulkan_context_x11.cpp +++ b/platform/linuxbsd/vulkan_context_x11.cpp @@ -29,7 +29,11 @@ /*************************************************************************/ #include "vulkan_context_x11.h" -#include <vulkan/vulkan_xlib.h> +#ifdef USE_VOLK +#include <volk.h> +#else +#include <vulkan/vulkan.h> +#endif const char *VulkanContextX11::_get_platform_surface_extension() const { return VK_KHR_XLIB_SURFACE_EXTENSION_NAME; |