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

• Show log

  Commit

• Hash : 93fc7d71
  Author :
  Date : 2020-05-19T14:03:42
  

  Add error-handling when getting Xcb window size
  
  We can't trust the reply from Xcb if an error has been flagged.
  This was causing a crash in SwANGLE.
  
  Bug: chromium:1080984
  Change-Id: Icaf58197869b563e4193efcf4e70646d519210cf
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2209255
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
  

Download

• src/libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.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.
  //
  // WindowSurfaceVkXcb.cpp:
  //    Implements the class methods for WindowSurfaceVkXcb.
  //
  
  #include "libANGLE/renderer/vulkan/xcb/WindowSurfaceVkXcb.h"
  
  #include "libANGLE/renderer/vulkan/RendererVk.h"
  
  namespace rx
  {
  
  WindowSurfaceVkXcb::WindowSurfaceVkXcb(const egl::SurfaceState &surfaceState,
                                         EGLNativeWindowType window,
                                         xcb_connection_t *conn)
      : WindowSurfaceVk(surfaceState, window), mXcbConnection(conn)
  {}
  
  angle::Result WindowSurfaceVkXcb::createSurfaceVk(vk::Context *context, gl::Extents *extentsOut)
  {
      VkXcbSurfaceCreateInfoKHR createInfo = {};
  
      createInfo.sType      = VK_STRUCTURE_TYPE_XCB_SURFACE_CREATE_INFO_KHR;
      createInfo.flags      = 0;
      createInfo.connection = mXcbConnection;
      createInfo.window     = static_cast<xcb_window_t>(mNativeWindowType);
      ANGLE_VK_TRY(context, vkCreateXcbSurfaceKHR(context->getRenderer()->getInstance(), &createInfo,
                                                  nullptr, &mSurface));
  
      return getCurrentWindowSize(context, extentsOut);
  }
  
  angle::Result WindowSurfaceVkXcb::getCurrentWindowSize(vk::Context *context,
                                                         gl::Extents *extentsOut)
  {
      xcb_get_geometry_cookie_t cookie =
          xcb_get_geometry(mXcbConnection, static_cast<xcb_drawable_t>(mNativeWindowType));
      xcb_generic_error_t *error      = nullptr;
      xcb_get_geometry_reply_t *reply = xcb_get_geometry_reply(mXcbConnection, cookie, &error);
      if (error)
      {
          free(error);
          ANGLE_VK_CHECK(context, false, VK_ERROR_INITIALIZATION_FAILED);
      }
      ASSERT(reply);
      *extentsOut = gl::Extents(reply->width, reply->height, 1);
      free(reply);
      return angle::Result::Continue;
  }
  
  }  // namespace rx
  

Download