Hash :
68bd685a
Author :
Date :
2020-10-10T22:58:41
Reland: "4 Vulkan content defined CLs." Reland "Vulkan: Avoid content restore by detecting no-op stencil" This relands commit 243d0f899e443cd931c78aba7489382dff79edbb. Reland "Vulkan: Restore at the end of RP if write-after-invalidate" This relands commit e5d52ac3b9a00656acdd912ee8cd62dd14784075. Reland "Vulkan: Invalidate/restore depth/stencil separately." This relands commit 61fa0878964a796f6d3b3c13bc3a3849403ecdbd. Reland "Vulkan: Move content-defined tracking to ImageHelper" This relands commit 2392e6b34c0ddfbfd7b4c3cb67323ba463e11a57. Reason for revert: Caused crashes in Fuchsia x64 and on ARM. Reland fixes content defined for external images. Original CL message: Content-defined tracking was done in render targets prior to this change. This had multiple drawbacks: - When a framebuffer attachment is changed (including the first time it's set), it's unknown whether the contents of the attachment is defined. - Invalidate takes effect at the end of render pass, at which point the render target objects may be gone. Attachment ImageHelpers are however correctly tracked. This change moves content-defined tracking to the ImageHelper itself, and tracks it per subresource. ImageHelper::onWrite() now receives the subresource that is being written, and marks it as having defined content. A future optimization can make use of this change to ImageHelper::onWrite to track "dirty" subresources. This can lead to the removal of unnecessary barriers when same-kind writes are done on different subresources of the image. See http://anglebug.com/3347#c15 Bug: b/167275320 Bug: angleproject:4836 Bug: angleproject:5159 Change-Id: If5c1ae7152657fd7c94db7d55bea4fb9ddf835ba Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2464825 Reviewed-by: Shahbaz Youssefi <syoussefi@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 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273
//
// Copyright 2019 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.
//
// OverlayVk.cpp:
// Implements the OverlayVk class.
//
#include "libANGLE/renderer/vulkan/OverlayVk.h"
#include "common/system_utils.h"
#include "libANGLE/Context.h"
#include "libANGLE/Overlay_font_autogen.h"
#include "libANGLE/renderer/vulkan/ContextVk.h"
#include <numeric>
namespace rx
{
OverlayVk::OverlayVk(const gl::OverlayState &state)
: OverlayImpl(state),
mSupportsSubgroupBallot(false),
mSupportsSubgroupArithmetic(false),
mRefreshCulledWidgets(false)
{}
OverlayVk::~OverlayVk() = default;
angle::Result OverlayVk::init(const gl::Context *context)
{
ContextVk *contextVk = vk::GetImpl(context);
RendererVk *rendererVk = contextVk->getRenderer();
const VkPhysicalDeviceSubgroupProperties &subgroupProperties =
rendererVk->getPhysicalDeviceSubgroupProperties();
uint32_t subgroupSize = subgroupProperties.subgroupSize;
// Currently, only subgroup sizes 32 and 64 are supported.
if (subgroupSize != 32 && subgroupSize != 64)
{
return angle::Result::Continue;
}
mSubgroupSize[0] = 8;
mSubgroupSize[1] = subgroupSize / 8;
constexpr VkSubgroupFeatureFlags kSubgroupBallotOperations =
VK_SUBGROUP_FEATURE_BASIC_BIT | VK_SUBGROUP_FEATURE_BALLOT_BIT;
constexpr VkSubgroupFeatureFlags kSubgroupArithmeticOperations =
VK_SUBGROUP_FEATURE_BASIC_BIT | VK_SUBGROUP_FEATURE_ARITHMETIC_BIT;
// If not all operations used in the shaders are supported, disable the overlay.
if ((subgroupProperties.supportedOperations & kSubgroupBallotOperations) ==
kSubgroupBallotOperations)
{
mSupportsSubgroupBallot = true;
}
else if ((subgroupProperties.supportedOperations & kSubgroupArithmeticOperations) ==
kSubgroupArithmeticOperations)
{
mSupportsSubgroupArithmetic = true;
}
ANGLE_TRY(createFont(contextVk));
mRefreshCulledWidgets = true;
return contextVk->flushImpl(nullptr);
}
void OverlayVk::onDestroy(const gl::Context *context)
{
RendererVk *renderer = vk::GetImpl(context)->getRenderer();
VkDevice device = renderer->getDevice();
mCulledWidgets.destroy(renderer);
mCulledWidgetsView.destroy(device);
mFontImage.destroy(renderer);
mFontImageView.destroy(device);
}
angle::Result OverlayVk::createFont(ContextVk *contextVk)
{
RendererVk *renderer = contextVk->getRenderer();
// Create a buffer to stage font data upload.
VkBufferCreateInfo bufferCreateInfo = {};
bufferCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
bufferCreateInfo.size =
gl::overlay::kFontCount * gl::overlay::kFontImageWidth * gl::overlay::kFontImageHeight;
bufferCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
bufferCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
vk::RendererScoped<vk::BufferHelper> fontDataBuffer(renderer);
ANGLE_TRY(fontDataBuffer.get().init(contextVk, bufferCreateInfo,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT));
uint8_t *fontData;
ANGLE_TRY(fontDataBuffer.get().map(contextVk, &fontData));
mState.initFontData(fontData);
ANGLE_TRY(fontDataBuffer.get().flush(renderer, 0, fontDataBuffer.get().getSize()));
fontDataBuffer.get().unmap(renderer);
// Create the font image.
ANGLE_TRY(
mFontImage.init(contextVk, gl::TextureType::_2D,
VkExtent3D{gl::overlay::kFontImageWidth, gl::overlay::kFontImageHeight, 1},
renderer->getFormat(angle::FormatID::R8_UNORM), 1,
VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
gl::LevelIndex(0), gl::LevelIndex(0), 1, gl::overlay::kFontCount));
ANGLE_TRY(mFontImage.initMemory(contextVk, renderer->getMemoryProperties(),
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
ANGLE_TRY(mFontImage.initImageView(contextVk, gl::TextureType::_2DArray,
VK_IMAGE_ASPECT_COLOR_BIT, gl::SwizzleState(),
&mFontImageView, vk::LevelIndex(0), 1));
// Copy font data from staging buffer.
ANGLE_TRY(contextVk->onBufferTransferRead(&fontDataBuffer.get()));
ANGLE_TRY(contextVk->onImageTransferWrite(gl::LevelIndex(0), 1, 0, gl::overlay::kFontCount,
VK_IMAGE_ASPECT_COLOR_BIT, &mFontImage));
vk::CommandBuffer &fontDataUpload = contextVk->getOutsideRenderPassCommandBuffer();
VkBufferImageCopy copy = {};
copy.bufferRowLength = gl::overlay::kFontImageWidth;
copy.bufferImageHeight = gl::overlay::kFontImageHeight;
copy.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copy.imageSubresource.layerCount = gl::overlay::kFontCount;
copy.imageExtent.width = gl::overlay::kFontImageWidth;
copy.imageExtent.height = gl::overlay::kFontImageHeight;
copy.imageExtent.depth = 1;
fontDataUpload.copyBufferToImage(fontDataBuffer.get().getBuffer().getHandle(),
mFontImage.getImage(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1,
©);
return angle::Result::Continue;
}
angle::Result OverlayVk::cullWidgets(ContextVk *contextVk)
{
RendererVk *renderer = contextVk->getRenderer();
// Release old culledWidgets image
mCulledWidgets.releaseImageFromShareContexts(renderer, contextVk);
contextVk->addGarbage(&mCulledWidgetsView);
// Create a buffer to contain coordinates of enabled text and graph widgets. This buffer will
// be used to perform tiled culling and can be discarded immediately after.
VkBufferCreateInfo bufferCreateInfo = {};
bufferCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
bufferCreateInfo.size = mState.getWidgetCoordinatesBufferSize();
bufferCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
bufferCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
vk::RendererScoped<vk::BufferHelper> enabledWidgetsBuffer(renderer);
ANGLE_TRY(enabledWidgetsBuffer.get().init(contextVk, bufferCreateInfo,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT));
// Fill the buffer with coordinate information from enabled widgets.
uint8_t *enabledWidgets;
ANGLE_TRY(enabledWidgetsBuffer.get().map(contextVk, &enabledWidgets));
gl::Extents presentImageExtents(mPresentImageExtent.width, mPresentImageExtent.height, 1);
mState.fillEnabledWidgetCoordinates(presentImageExtents, enabledWidgets);
ANGLE_TRY(enabledWidgetsBuffer.get().flush(renderer, 0, enabledWidgetsBuffer.get().getSize()));
enabledWidgetsBuffer.get().unmap(renderer);
// Allocate mCulledWidget and its view.
VkExtent3D culledWidgetsExtent = {
UnsignedCeilDivide(mPresentImageExtent.width, mSubgroupSize[0]),
UnsignedCeilDivide(mPresentImageExtent.height, mSubgroupSize[1]), 1};
ANGLE_TRY(mCulledWidgets.init(contextVk, gl::TextureType::_2D, culledWidgetsExtent,
renderer->getFormat(angle::FormatID::R32G32_UINT), 1,
VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
gl::LevelIndex(0), gl::LevelIndex(0), 1, 1));
ANGLE_TRY(mCulledWidgets.initMemory(contextVk, renderer->getMemoryProperties(),
VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
ANGLE_TRY(mCulledWidgets.initImageView(contextVk, gl::TextureType::_2D,
VK_IMAGE_ASPECT_COLOR_BIT, gl::SwizzleState(),
&mCulledWidgetsView, vk::LevelIndex(0), 1));
UtilsVk::OverlayCullParameters params;
params.subgroupSize[0] = mSubgroupSize[0];
params.subgroupSize[1] = mSubgroupSize[1];
params.supportsSubgroupBallot = mSupportsSubgroupBallot;
params.supportsSubgroupArithmetic = mSupportsSubgroupArithmetic;
return contextVk->getUtils().cullOverlayWidgets(contextVk, &enabledWidgetsBuffer.get(),
&mCulledWidgets, &mCulledWidgetsView, params);
}
angle::Result OverlayVk::onPresent(ContextVk *contextVk,
vk::ImageHelper *imageToPresent,
const vk::ImageView *imageToPresentView)
{
if (mState.getEnabledWidgetCount() == 0)
{
return angle::Result::Continue;
}
RendererVk *renderer = contextVk->getRenderer();
// If the swapchain image doesn't support storage image, we can't output to it.
VkFormatFeatureFlags featureBits = renderer->getImageFormatFeatureBits(
imageToPresent->getFormat().vkImageFormat, VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT);
if ((featureBits & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) == 0)
{
return angle::Result::Continue;
}
const VkExtent3D &imageExtent = imageToPresent->getExtents();
mRefreshCulledWidgets = mRefreshCulledWidgets ||
mPresentImageExtent.width != imageExtent.width ||
mPresentImageExtent.height != imageExtent.height;
if (mRefreshCulledWidgets)
{
mPresentImageExtent.width = imageExtent.width;
mPresentImageExtent.height = imageExtent.height;
ANGLE_TRY(cullWidgets(contextVk));
mRefreshCulledWidgets = false;
}
vk::RendererScoped<vk::BufferHelper> textDataBuffer(renderer);
vk::RendererScoped<vk::BufferHelper> graphDataBuffer(renderer);
VkBufferCreateInfo textBufferCreateInfo = {};
textBufferCreateInfo.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
textBufferCreateInfo.size = mState.getTextWidgetsBufferSize();
textBufferCreateInfo.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT;
textBufferCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
VkBufferCreateInfo graphBufferCreateInfo = textBufferCreateInfo;
graphBufferCreateInfo.size = mState.getGraphWidgetsBufferSize();
ANGLE_TRY(textDataBuffer.get().init(contextVk, textBufferCreateInfo,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT));
ANGLE_TRY(graphDataBuffer.get().init(contextVk, graphBufferCreateInfo,
VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT));
uint8_t *textData;
uint8_t *graphData;
ANGLE_TRY(textDataBuffer.get().map(contextVk, &textData));
ANGLE_TRY(graphDataBuffer.get().map(contextVk, &graphData));
gl::Extents presentImageExtents(mPresentImageExtent.width, mPresentImageExtent.height, 1);
mState.fillWidgetData(presentImageExtents, textData, graphData);
ANGLE_TRY(textDataBuffer.get().flush(renderer, 0, textDataBuffer.get().getSize()));
ANGLE_TRY(graphDataBuffer.get().flush(renderer, 0, graphDataBuffer.get().getSize()));
textDataBuffer.get().unmap(renderer);
graphDataBuffer.get().unmap(renderer);
UtilsVk::OverlayDrawParameters params;
params.subgroupSize[0] = mSubgroupSize[0];
params.subgroupSize[1] = mSubgroupSize[1];
return contextVk->getUtils().drawOverlay(
contextVk, &textDataBuffer.get(), &graphDataBuffer.get(), &mFontImage, &mFontImageView,
&mCulledWidgets, &mCulledWidgetsView, imageToPresent, imageToPresentView, params);
}
} // namespace rx