Hash :
aa244358
Author :
Date :
2024-02-06T14:44:39
Reland "Vulkan: Get rid of X11 include in DisplayVkXcb.cpp" This is a reland of commit 8abbe2836bb49faba8a97e2df59058290e1c385a In the reland, the xcb-util dependency is removed. Original change's description: > Vulkan: Get rid of X11 include in DisplayVkXcb.cpp > > Bug: angleproject:8520 > Change-Id: Iaa251b0ba2858873b8d22e8f9e5dae7a2567c95e > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5273489 > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Auto-Submit: Shahbaz Youssefi <syoussefi@chromium.org> > Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> > Commit-Queue: Geoff Lang <geofflang@chromium.org> Bug: angleproject:8520 Change-Id: I238e0a6c3b94398c10fa1bc39c5a0b4261797311 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5292774 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165
//
// Copyright 2016 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// DisplayVkXcb.cpp:
// Implements the class methods for DisplayVkXcb.
//
#include "libANGLE/renderer/vulkan/linux/xcb/DisplayVkXcb.h"
#include <xcb/xcb.h>
#include "common/system_utils.h"
#include "libANGLE/Display.h"
#include "libANGLE/renderer/vulkan/linux/xcb/WindowSurfaceVkXcb.h"
#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
namespace rx
{
namespace
{
EGLint GetXcbVisualType(xcb_screen_t *screen)
{
// Visual type is the class member of xcb_visualtype_t whose id matches the root visual.
for (xcb_depth_iterator_t depth_iter = xcb_screen_allowed_depths_iterator(screen);
depth_iter.rem; xcb_depth_next(&depth_iter))
{
for (xcb_visualtype_iterator_t visual_iter = xcb_depth_visuals_iterator(depth_iter.data);
visual_iter.rem; xcb_visualtype_next(&visual_iter))
{
if (screen->root_visual == visual_iter.data->visual_id)
{
return visual_iter.data->_class;
}
}
}
return EGL_NONE;
}
} // namespace
DisplayVkXcb::DisplayVkXcb(const egl::DisplayState &state)
: DisplayVkLinux(state), mXcbConnection(nullptr), mHasXDisplay(false)
{}
egl::Error DisplayVkXcb::initialize(egl::Display *display)
{
mHasXDisplay = !angle::GetEnvironmentVar("DISPLAY").empty();
if (mHasXDisplay)
{
mXcbConnection = xcb_connect(nullptr, nullptr);
ASSERT(mXcbConnection != nullptr);
int xcb_connection_error = xcb_connection_has_error(mXcbConnection);
if (xcb_connection_error)
{
ERR() << "xcb_connect() failed, error " << xcb_connection_error;
xcb_disconnect(mXcbConnection);
mXcbConnection = nullptr;
return egl::EglNotInitialized();
}
}
return DisplayVk::initialize(display);
}
void DisplayVkXcb::terminate()
{
if (mHasXDisplay)
{
ASSERT(mXcbConnection != nullptr);
xcb_disconnect(mXcbConnection);
mXcbConnection = nullptr;
}
DisplayVk::terminate();
}
bool DisplayVkXcb::isValidNativeWindow(EGLNativeWindowType window) const
{
ASSERT(mHasXDisplay);
// There doesn't appear to be an xcb function explicitly for checking the validity of a
// window ID, but xcb_query_tree_reply will return nullptr if the window doesn't exist.
xcb_query_tree_cookie_t cookie =
xcb_query_tree(mXcbConnection, static_cast<xcb_window_t>(window));
xcb_query_tree_reply_t *reply = xcb_query_tree_reply(mXcbConnection, cookie, nullptr);
if (reply)
{
free(reply);
return true;
}
return false;
}
SurfaceImpl *DisplayVkXcb::createWindowSurfaceVk(const egl::SurfaceState &state,
EGLNativeWindowType window)
{
ASSERT(mHasXDisplay);
return new WindowSurfaceVkXcb(state, window, mXcbConnection);
}
egl::ConfigSet DisplayVkXcb::generateConfigs()
{
const std::array<GLenum, 1> kColorFormats = {GL_BGRA8_EXT};
std::vector<GLenum> depthStencilFormats(
egl_vk::kConfigDepthStencilFormats,
egl_vk::kConfigDepthStencilFormats + ArraySize(egl_vk::kConfigDepthStencilFormats));
if (getCaps().stencil8)
{
depthStencilFormats.push_back(GL_STENCIL_INDEX8);
}
return egl_vk::GenerateConfigs(kColorFormats.data(), kColorFormats.size(),
depthStencilFormats.data(), depthStencilFormats.size(), this);
}
void DisplayVkXcb::checkConfigSupport(egl::Config *config)
{
// If no window system, cannot support windows.
if (!mHasXDisplay)
{
// No window support if no X11.
config->surfaceType &= ~EGL_WINDOW_BIT;
return;
}
// TODO(geofflang): Test for native support and modify the config accordingly.
// http://anglebug.com/2692
// Find the screen the window was created on:
xcb_screen_iterator_t screenIterator = xcb_setup_roots_iterator(xcb_get_setup(mXcbConnection));
ASSERT(screenIterator.rem);
xcb_screen_t *screen = screenIterator.data;
ASSERT(screen);
// Visual id is root_visual of the screen
config->nativeVisualID = screen->root_visual;
config->nativeVisualType = GetXcbVisualType(screen);
}
const char *DisplayVkXcb::getWSIExtension() const
{
return VK_KHR_XCB_SURFACE_EXTENSION_NAME;
}
bool IsVulkanXcbDisplayAvailable()
{
return true;
}
DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state)
{
return new DisplayVkXcb(state);
}
angle::Result DisplayVkXcb::waitNativeImpl()
{
// The following is the implementation of xcb_aux_sync (equivalent of XSync). xcb_aux_sync is
// not called directly because it's in the libxcb-util package, which Chrome does not want to
// depend on (due to different package versions in popular distros).
free(xcb_get_input_focus_reply(mXcbConnection, xcb_get_input_focus(mXcbConnection), nullptr));
return angle::Result::Continue;
}
} // namespace rx