Hash :
cfb430c8
Author :
Date :
2025-02-10T13:19:05
Remove angle::ErrorStream helper Most uses of the helper either use just the code or a fixed string, which compiles to a few instructions. Using this helper adds 200+ bytes of assembly to each use, due to the unneeded instantiation of ostringstream which allocates a buffer etc. The combined effect of this CL on an Android perf build is ~12KB (0.2%) reduction in size. The cases where the message is actually formatted are converted to an explicit use of ostringstream. Removing the helper so that the new code is explicit about the intent to use ostringstream, or an alternative way to format the message. Discovered accidentally while looking into size reduction due to __builtin_unreachable() Semi-automated code change, risk of copy-paste mistakes should be minimal. Bug: angleproject:394129077 Change-Id: I47c2642d750d31416b08a1cfa435d5463c294e35 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6250078 Commit-Queue: Roman Lavrov <romanl@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Charlie Lao <cclao@google.com>
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
//
// Copyright 2021-2022 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.
//
// DisplayVkWayland.cpp:
// Implements the class methods for DisplayVkWayland.
//
#include "libANGLE/renderer/vulkan/linux/wayland/DisplayVkWayland.h"
#include <wayland-client.h>
#include "common/angleutils.h"
#include "common/linux/dma_buf_utils.h"
#include "common/system_utils.h"
#include "libANGLE/Display.h"
#include "libANGLE/renderer/vulkan/linux/wayland/WindowSurfaceVkWayland.h"
#include "libANGLE/renderer/vulkan/vk_caps_utils.h"
#include "libANGLE/renderer/vulkan/vk_renderer.h"
namespace rx
{
DisplayVkWayland::DisplayVkWayland(const egl::DisplayState &state)
: DisplayVkLinux(state), mOwnDisplay(false), mWaylandDisplay(nullptr)
{}
egl::Error DisplayVkWayland::initialize(egl::Display *display)
{
EGLNativeDisplayType nativeDisplay = display->getNativeDisplayId();
if (nativeDisplay == EGL_DEFAULT_DISPLAY)
{
mOwnDisplay = true;
mWaylandDisplay = wl_display_connect(nullptr);
}
else
{
mWaylandDisplay = reinterpret_cast<wl_display *>(nativeDisplay);
}
if (!mWaylandDisplay)
{
ERR() << "Failed to retrieve wayland display";
return egl::Error(EGL_NOT_INITIALIZED);
}
egl::Error ret = DisplayVk::initialize(display);
if (ret.isError())
{
return ret;
}
return ret;
}
void DisplayVkWayland::terminate()
{
if (mOwnDisplay)
{
wl_display_disconnect(mWaylandDisplay);
mOwnDisplay = false;
}
mWaylandDisplay = nullptr;
DisplayVk::terminate();
}
bool DisplayVkWayland::isValidNativeWindow(EGLNativeWindowType window) const
{
// Wayland display Errors are fatal.
// If this function returns non-zero, the display is not valid anymore.
int error = wl_display_get_error(mWaylandDisplay);
if (error)
{
WARN() << "Wayland window is not valid: " << error << " " << strerror(error);
}
return error == 0;
}
SurfaceImpl *DisplayVkWayland::createWindowSurfaceVk(const egl::SurfaceState &state,
EGLNativeWindowType window)
{
return new WindowSurfaceVkWayland(state, window, mWaylandDisplay);
}
egl::ConfigSet DisplayVkWayland::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 DisplayVkWayland::checkConfigSupport(egl::Config *config)
{
// In wayland there is no native visual ID or type
}
const char *DisplayVkWayland::getWSIExtension() const
{
return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME;
}
angle::NativeWindowSystem DisplayVkWayland::getWindowSystem() const
{
return angle::NativeWindowSystem::Wayland;
}
bool IsVulkanWaylandDisplayAvailable()
{
wl_display *display = wl_display_connect(nullptr);
if (!display)
{
return false;
}
wl_display_disconnect(display);
return true;
}
DisplayImpl *CreateVulkanWaylandDisplay(const egl::DisplayState &state)
{
return new DisplayVkWayland(state);
}
} // namespace rx