Hash :
bae19e06
Author :
Date :
2021-10-26T13:35:57
Vulkan: Avoid unnecessary wait if mapBufferRange indicates read only When we call BufferVk::mapRangeImpl(), both from internal code paths for data reads or due to glMapBufferRange call, we are not passing the access bit to the call. This CL passes the proper access bits to the call and only wait for GPU writes to finish if access is for read only. This CL also adds access bitfield to the BufferVk::mapImpl() API and have various callers pass in the proper access bits as well. Bug: b/203582620 Change-Id: Ica8493c902dbd7b15996266c81ce0fd4dbfc2520 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3245487 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: 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 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
//
// Copyright 2017 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.
//
// Resource:
// Resource lifetime tracking in the Vulkan back-end.
//
#include "libANGLE/renderer/vulkan/ResourceVk.h"
#include "libANGLE/renderer/vulkan/ContextVk.h"
namespace rx
{
namespace vk
{
namespace
{
angle::Result FinishRunningCommands(ContextVk *contextVk, Serial serial)
{
return contextVk->finishToSerial(serial);
}
template <typename T>
angle::Result WaitForIdle(ContextVk *contextVk, const char *debugMessage, T *resource)
{
// If there are pending commands for the resource, flush them.
if (resource->usedInRecordedCommands())
{
ANGLE_TRY(contextVk->flushImpl(nullptr));
}
// Make sure the driver is done with the resource.
if (resource->usedInRunningCommands(contextVk->getLastCompletedQueueSerial()))
{
if (debugMessage)
{
ANGLE_PERF_WARNING(contextVk->getDebug(), GL_DEBUG_SEVERITY_HIGH, debugMessage);
}
ANGLE_TRY(resource->finishRunningCommands(contextVk));
}
ASSERT(!resource->isCurrentlyInUse(contextVk->getLastCompletedQueueSerial()));
return angle::Result::Continue;
}
} // namespace
// Resource implementation.
Resource::Resource()
{
mUse.init();
}
Resource::Resource(Resource &&other) : Resource()
{
mUse = std::move(other.mUse);
}
Resource::~Resource()
{
mUse.release();
}
angle::Result Resource::finishRunningCommands(ContextVk *contextVk)
{
return FinishRunningCommands(contextVk, mUse.getSerial());
}
angle::Result Resource::waitForIdle(ContextVk *contextVk, const char *debugMessage)
{
return WaitForIdle(contextVk, debugMessage, this);
}
// Resource implementation.
ReadWriteResource::ReadWriteResource()
{
mReadOnlyUse.init();
mReadWriteUse.init();
}
ReadWriteResource::ReadWriteResource(ReadWriteResource &&other) : ReadWriteResource()
{
mReadOnlyUse = std::move(other.mReadOnlyUse);
mReadWriteUse = std::move(other.mReadWriteUse);
}
ReadWriteResource::~ReadWriteResource()
{
mReadOnlyUse.release();
mReadWriteUse.release();
}
angle::Result ReadWriteResource::finishRunningCommands(ContextVk *contextVk)
{
ASSERT(!mReadOnlyUse.usedInRecordedCommands());
return FinishRunningCommands(contextVk, mReadOnlyUse.getSerial());
}
angle::Result ReadWriteResource::finishGPUWriteCommands(ContextVk *contextVk)
{
ASSERT(!mReadWriteUse.usedInRecordedCommands());
return FinishRunningCommands(contextVk, mReadWriteUse.getSerial());
}
angle::Result ReadWriteResource::waitForIdle(ContextVk *contextVk, const char *debugMessage)
{
return WaitForIdle(contextVk, debugMessage, this);
}
// SharedGarbage implementation.
SharedGarbage::SharedGarbage() = default;
SharedGarbage::SharedGarbage(SharedGarbage &&other)
{
*this = std::move(other);
}
SharedGarbage::SharedGarbage(SharedResourceUse &&use, std::vector<GarbageObject> &&garbage)
: mLifetime(std::move(use)), mGarbage(std::move(garbage))
{}
SharedGarbage::~SharedGarbage() = default;
SharedGarbage &SharedGarbage::operator=(SharedGarbage &&rhs)
{
std::swap(mLifetime, rhs.mLifetime);
std::swap(mGarbage, rhs.mGarbage);
return *this;
}
bool SharedGarbage::destroyIfComplete(RendererVk *renderer, Serial completedSerial)
{
if (mLifetime.isCurrentlyInUse(completedSerial))
return false;
for (GarbageObject &object : mGarbage)
{
object.destroy(renderer);
}
mLifetime.release();
return true;
}
// ResourceUseList implementation.
ResourceUseList::ResourceUseList()
{
constexpr size_t kDefaultResourceUseCount = 4096;
mResourceUses.reserve(kDefaultResourceUseCount);
}
ResourceUseList::ResourceUseList(ResourceUseList &&other)
{
*this = std::move(other);
}
ResourceUseList::~ResourceUseList()
{
ASSERT(mResourceUses.empty());
}
ResourceUseList &ResourceUseList::operator=(ResourceUseList &&rhs)
{
std::swap(mResourceUses, rhs.mResourceUses);
return *this;
}
void ResourceUseList::releaseResourceUses()
{
for (SharedResourceUse &use : mResourceUses)
{
use.release();
}
mResourceUses.clear();
}
void ResourceUseList::releaseResourceUsesAndUpdateSerials(Serial serial)
{
for (SharedResourceUse &use : mResourceUses)
{
use.releaseAndUpdateSerial(serial);
}
mResourceUses.clear();
}
} // namespace vk
} // namespace rx