Hash :
dbd47e37
Author :
Date :
2023-01-30T20:54:24
Revert "Metal: Avoid leaking buffers for GPU access for non-discrete" This reverts commit 369b320f92f54774879e8b8faff834fc8db0793e. Reason for revert: WebGL 2.0 conformance tests failing on Mac/AMD per https://bugs.chromium.org/p/angleproject/issues/detail?id=7975#c4 Original change's description: > Metal: Avoid leaking buffers for GPU access for non-discrete > > The code would pass BufferManager::getBuffer(..,useShared=false,..) > and use that as key to try to obtain a buffer from the cache. > The BufferManager would store the returned buffers based on > the actual storage mode of the buffer. The storage mode for the > buffers for integrated / iOS devices is always shared. > > The above logic would lead the buffer manager always storing returned > buffers to the cache, but never being able to consume any from the > cache. The cache is designed to grow unbounded, and so it did. > > Remove the inconsistent logic of passing variation of "use shared bool" > as the arguments. Various places consulted various different Feature > options in inconsistent manner. > > Instead, add Buffer::AccessPattern for the callers to express what > kind of access pattern to expect a buffer to be used. Add explicit > MTLStorageMode parameters to Buffer constructing functions. > Remove redundant functions from Buffer. > Remove dead code from BufferPool related to allocation policy. > > Bug: angleproject:7975 > Change-Id: I0c4661c55e8c907b702160ae42690269c049f6db > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4194172 > Reviewed-by: Kenneth Russell <kbr@chromium.org> > Commit-Queue: Kenneth Russell <kbr@chromium.org> > Reviewed-by: Gregg Tavares <gman@chromium.org> > Auto-Submit: Kimmo Kinnunen <kkinnunen@apple.com> Bug: angleproject:7975 Change-Id: I094de8e5b06392fe36a9887d6a817023baa48735 No-Presubmit: true Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4206187 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Yuly Novikov <ynovikov@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
//
// Copyright (c) 2020 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.
//
// mtl_occlusion_query_pool: A visibility pool for allocating visibility query within
// one render pass.
//
#include "libANGLE/renderer/metal/mtl_occlusion_query_pool.h"
#include "libANGLE/renderer/metal/ContextMtl.h"
#include "libANGLE/renderer/metal/DisplayMtl.h"
#include "libANGLE/renderer/metal/QueryMtl.h"
namespace rx
{
namespace mtl
{
// OcclusionQueryPool implementation
OcclusionQueryPool::OcclusionQueryPool() {}
OcclusionQueryPool::~OcclusionQueryPool() {}
void OcclusionQueryPool::destroy(ContextMtl *contextMtl)
{
mRenderPassResultsPool = nullptr;
for (QueryMtl *allocatedQuery : mAllocatedQueries)
{
if (!allocatedQuery)
{
continue;
}
allocatedQuery->clearAllocatedVisibilityOffsets();
}
mAllocatedQueries.clear();
}
angle::Result OcclusionQueryPool::allocateQueryOffset(ContextMtl *contextMtl,
QueryMtl *query,
bool clearOldValue)
{
// Only query that already has allocated offset or first query of the render pass is allowed to
// keep old value. Other queries must be reset to zero before counting the samples visibility in
// draw calls.
ASSERT(clearOldValue || mAllocatedQueries.empty() ||
!query->getAllocatedVisibilityOffsets().empty());
uint32_t currentOffset =
static_cast<uint32_t>(mAllocatedQueries.size()) * kOcclusionQueryResultSize;
if (!mRenderPassResultsPool)
{
// First allocation
ANGLE_TRY(Buffer::MakeBufferWithResOpt(contextMtl, MTLResourceStorageModePrivate,
kOcclusionQueryResultSize, nullptr,
&mRenderPassResultsPool));
mRenderPassResultsPool->get().label = @"OcclusionQueryPool";
}
else if (currentOffset + kOcclusionQueryResultSize > mRenderPassResultsPool->size())
{
// Double the capacity
ANGLE_TRY(Buffer::MakeBufferWithResOpt(contextMtl, MTLResourceStorageModePrivate,
mRenderPassResultsPool->size() * 2, nullptr,
&mRenderPassResultsPool));
mRenderPassResultsPool->get().label = @"OcclusionQueryPool";
}
if (clearOldValue)
{
// If old value is not needed, deallocate any offset previously allocated for this query.
deallocateQueryOffset(contextMtl, query);
}
if (query->getAllocatedVisibilityOffsets().empty())
{
mAllocatedQueries.push_back(query);
query->setFirstAllocatedVisibilityOffset(currentOffset);
}
else
{
// Additional offset allocated for a query is only allowed if it is a continuous region.
ASSERT(currentOffset ==
query->getAllocatedVisibilityOffsets().back() + kOcclusionQueryResultSize);
// Just reserve an empty slot in the allocated query array
mAllocatedQueries.push_back(nullptr);
query->addAllocatedVisibilityOffset();
}
if (currentOffset == 0)
{
mResetFirstQuery = clearOldValue;
if (!clearOldValue && !contextMtl->getDisplay()->getFeatures().allowBufferReadWrite.enabled)
{
// If old value of first query needs to be retained and device doesn't support buffer
// read-write, we need an additional offset to store the old value of the query.
return allocateQueryOffset(contextMtl, query, false);
}
}
return angle::Result::Continue;
}
void OcclusionQueryPool::deallocateQueryOffset(ContextMtl *contextMtl, QueryMtl *query)
{
if (query->getAllocatedVisibilityOffsets().empty())
{
return;
}
mAllocatedQueries[query->getAllocatedVisibilityOffsets().front() / kOcclusionQueryResultSize] =
nullptr;
query->clearAllocatedVisibilityOffsets();
}
void OcclusionQueryPool::resolveVisibilityResults(ContextMtl *contextMtl)
{
if (mAllocatedQueries.empty())
{
return;
}
RenderUtils &utils = contextMtl->getDisplay()->getUtils();
BlitCommandEncoder *blitEncoder = nullptr;
// Combine the values stored in the offsets allocated for first query
if (mAllocatedQueries[0])
{
const BufferRef &dstBuf = mAllocatedQueries[0]->getVisibilityResultBuffer();
const VisibilityBufferOffsetsMtl &allocatedOffsets =
mAllocatedQueries[0]->getAllocatedVisibilityOffsets();
if (!mResetFirstQuery &&
!contextMtl->getDisplay()->getFeatures().allowBufferReadWrite.enabled)
{
// If we cannot read and write to the same buffer in shader. We need to copy the old
// value of first query to first offset allocated for it.
blitEncoder = contextMtl->getBlitCommandEncoder();
blitEncoder->copyBuffer(dstBuf, 0, mRenderPassResultsPool, allocatedOffsets.front(),
kOcclusionQueryResultSize);
utils.combineVisibilityResult(contextMtl, false, allocatedOffsets,
mRenderPassResultsPool, dstBuf);
}
else
{
utils.combineVisibilityResult(contextMtl, !mResetFirstQuery, allocatedOffsets,
mRenderPassResultsPool, dstBuf);
}
}
// Combine the values stored in the offsets allocated for each of the remaining queries
for (size_t i = 1; i < mAllocatedQueries.size(); ++i)
{
QueryMtl *query = mAllocatedQueries[i];
if (!query)
{
continue;
}
const BufferRef &dstBuf = mAllocatedQueries[i]->getVisibilityResultBuffer();
const VisibilityBufferOffsetsMtl &allocatedOffsets =
mAllocatedQueries[i]->getAllocatedVisibilityOffsets();
utils.combineVisibilityResult(contextMtl, false, allocatedOffsets, mRenderPassResultsPool,
dstBuf);
}
// Request synchronization and cleanup
blitEncoder = contextMtl->getBlitCommandEncoder();
for (size_t i = 0; i < mAllocatedQueries.size(); ++i)
{
QueryMtl *query = mAllocatedQueries[i];
if (!query)
{
continue;
}
const BufferRef &dstBuf = mAllocatedQueries[i]->getVisibilityResultBuffer();
dstBuf->syncContent(contextMtl, blitEncoder);
query->clearAllocatedVisibilityOffsets();
}
mAllocatedQueries.clear();
}
}
}