kc3-lang/angle/src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp

• Show log

  Commit

• Hash : ba4e2b94
  Author :
  Date : 2020-05-21T09:40:37
  

  Type cast EGLNativeDisplayType to _XDisplay* in xcb and glx
  
  As we are approaching the point when DisplayGLX will be compiled
  in Ozone/X11 configuration, we need to resolve compilation errors.
  
  Ozone has intptr_t EGLNativeDisplayType whereas X11 requires
  Display* aka _XDisplay*. We've already done so in Chromium, and
  it's time to do the same cast in angle.
  
  Bug: chromium:1084458
  Change-Id: I11b5ae2e10bfa316cbaa882be86af6894cfdbbf2
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2211761
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Commit-Queue: Geoff Lang <geofflang@chromium.org>
  

Download

• src/libANGLE/renderer/vulkan/xcb/DisplayVkXcb.cpp

• //
  // 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/xcb/DisplayVkXcb.h"
  
  #include <X11/Xutil.h>
  #include <xcb/xcb.h>
  
  #include "libANGLE/Display.h"
  #include "libANGLE/renderer/vulkan/vk_caps_utils.h"
  #include "libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.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)
      : DisplayVk(state), mXcbConnection(nullptr)
  {}
  
  egl::Error DisplayVkXcb::initialize(egl::Display *display)
  {
      mXcbConnection = xcb_connect(nullptr, nullptr);
      if (mXcbConnection == nullptr)
      {
          return egl::EglNotInitialized();
      }
      return DisplayVk::initialize(display);
  }
  
  void DisplayVkXcb::terminate()
  {
      ASSERT(mXcbConnection != nullptr);
      xcb_disconnect(mXcbConnection);
      mXcbConnection = nullptr;
      DisplayVk::terminate();
  }
  
  bool DisplayVkXcb::isValidNativeWindow(EGLNativeWindowType window) const
  {
      // 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)
  {
      return new WindowSurfaceVkXcb(state, window, mXcbConnection);
  }
  
  egl::ConfigSet DisplayVkXcb::generateConfigs()
  {
      constexpr GLenum kColorFormats[] = {GL_BGRA8_EXT};
      return egl_vk::GenerateConfigs(kColorFormats, egl_vk::kConfigDepthStencilFormats, this);
  }
  
  bool DisplayVkXcb::checkConfigSupport(egl::Config *config)
  {
      // 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);
  
      return true;
  }
  
  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()
  {
      XSync(reinterpret_cast<Display *>(mState.displayId), False);
      return angle::Result::Continue;
  }
  }  // namespace rx
  

Download