Skip to content
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

vulkaninfo: On X11 use default visual #1042

Merged
merged 1 commit into from
Oct 23, 2024
+9 −3
Merged

vulkaninfo: On X11 use default visual #1042

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
12 changes: 9 additions & 3 deletions vulkaninfo/vulkaninfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
#endif // _WIN32

#if defined(VK_USE_PLATFORM_XLIB_KHR) || defined(VK_USE_PLATFORM_XCB_KHR)
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#endif

Expand Down Expand Up @@ -772,7 +773,7 @@ static void AppDestroyXcbWindow(AppInstance &inst) {
#ifdef VK_USE_PLATFORM_XLIB_KHR
static void AppCreateXlibWindow(AppInstance &inst) {
long visualMask = VisualScreenMask;
int numberOfVisuals;
int numberOfVisuals{};

inst.xlib_display = XOpenDisplay(nullptr);
if (inst.xlib_display == nullptr) {
Expand All @@ -781,12 +782,17 @@ static void AppCreateXlibWindow(AppInstance &inst) {

XVisualInfo vInfoTemplate = {};
vInfoTemplate.screen = DefaultScreen(inst.xlib_display);
XVisualInfo *visualInfo = XGetVisualInfo(inst.xlib_display, visualMask, &vInfoTemplate, &numberOfVisuals);
XVisualInfo *visualInfoBegin = XGetVisualInfo(inst.xlib_display, visualMask, &vInfoTemplate, &numberOfVisuals);
XVisualInfo *visualInfoEnd = visualInfoBegin + numberOfVisuals;
const Visual *rootVisual = DefaultVisual(inst.xlib_display, vInfoTemplate.screen);
const XVisualInfo *foundVisualInfo =
std::find_if(visualInfoBegin, visualInfoEnd, [rootVisual](const XVisualInfo &vi) { return vi.visual == rootVisual; });
const XVisualInfo *visualInfo = foundVisualInfo == visualInfoEnd ? visualInfoBegin : foundVisualInfo;
inst.xlib_window = XCreateWindow(inst.xlib_display, RootWindow(inst.xlib_display, vInfoTemplate.screen), 0, 0, inst.width,
inst.height, 0, visualInfo->depth, InputOutput, visualInfo->visual, 0, nullptr);

XSync(inst.xlib_display, false);
XFree(visualInfo);
XFree(visualInfoBegin);
}

static VkSurfaceKHR AppCreateXlibSurface(AppInstance &inst) {
Expand Down
Loading