Skip to content

Don't use X11 code when using SDL Vulkan. #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vanfanel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't use X11 code when using SDL Vulkan. #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plume_render_interface_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <Windows.h>
#elif defined(__ANDROID__)
#include "android/native_window.h"
#elif defined(__linux__)
#elif defined(__linux__) && !defined(PLUME_SDL_VULKAN_ENABLED)
#include "X11/Xlib.h"
#undef None
#undef Status
Expand Down
2 changes: 2 additions & 0 deletions plume_vulkan.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ namespace plume {
# elif defined(__ANDROID__)
VK_KHR_ANDROID_SURFACE_EXTENSION_NAME,
# elif defined(__linux__)
# if !defined(PLUME_SDL_VULKAN_ENABLED)
VK_KHR_XLIB_SURFACE_EXTENSION_NAME,
# endif
# elif defined(__APPLE__)
VK_EXT_METAL_SURFACE_EXTENSION_NAME,
# endif
Expand Down
2 changes: 1 addition & 1 deletion plume_vulkan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define VK_USE_PLATFORM_WIN32_KHR
#elif defined(__ANDROID__)
#define VK_USE_PLATFORM_ANDROID_KHR
#elif defined(__linux__)
#elif defined(__linux__) && !defined(PLUME_SDL_VULKAN_ENABLED)
#define VK_USE_PLATFORM_XLIB_KHR
#elif defined(__APPLE__)
#define VK_USE_PLATFORM_METAL_EXT
Expand Down