Commit 579c5940 by Jamie Madill Committed by Commit Bot

Vulkan: Rename onGraphAccess to onResourceAccess.

Clarifies the function for the upcoming command graph linearization. Bug: angleproject:4029 Change-Id: Ib50997c007053757de533f69c155a92d7555e0b2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2003235 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 09a2d065
......@@ -379,7 +379,7 @@ angle::Result BufferVk::setDataImpl(ContextVk *contextVk,
VkBufferCopy copyRegion = {stagingBufferOffset, offset, size};
ANGLE_TRY(mBuffer.copyFromBuffer(contextVk, mStagingBuffer.getCurrentBuffer()->getBuffer(),
VK_ACCESS_HOST_WRITE_BIT, copyRegion));
mStagingBuffer.getCurrentBuffer()->onGraphAccess(&contextVk->getResourceUseList());
mStagingBuffer.getCurrentBuffer()->onResourceAccess(&contextVk->getResourceUseList());
}
else
{
......
......@@ -366,7 +366,7 @@ void CommandGraphResource::addWriteDependency(ContextVk *contextVk,
void CommandGraphResource::addReadDependency(ContextVk *contextVk,
CommandGraphResource *readingResource)
{
onGraphAccess(&contextVk->getResourceUseList());
onResourceAccess(&contextVk->getResourceUseList());
CommandGraphNode *readingNode = readingResource->mCurrentWritingNode;
ASSERT(readingNode);
......@@ -396,7 +396,7 @@ void CommandGraphResource::startNewCommands(ContextVk *contextVk)
void CommandGraphResource::onWriteImpl(ContextVk *contextVk, CommandGraphNode *writingNode)
{
onGraphAccess(&contextVk->getResourceUseList());
onResourceAccess(&contextVk->getResourceUseList());
// Make sure any open reads and writes finish before we execute 'writingNode'.
if (!mCurrentReadingNodes.empty())
......
......@@ -463,7 +463,7 @@ class CommandGraphResource : angle::NonCopyable
// Updates the in-use serial tracked for this resource. Will clear dependencies if the resource
// was not used in this set of command nodes.
void onGraphAccess(ResourceUseList *resourceUseList);
void onResourceAccess(ResourceUseList *resourceUseList);
void updateCurrentAccessNodes();
// If a resource is recreated, as in released and reinitialized, the next access to the
......@@ -696,7 +696,7 @@ ANGLE_INLINE void CommandGraphResource::onResourceRecreated(ResourceUseList *res
resourceUseList->add(mUse);
}
ANGLE_INLINE void CommandGraphResource::onGraphAccess(ResourceUseList *resourceUseList)
ANGLE_INLINE void CommandGraphResource::onResourceAccess(ResourceUseList *resourceUseList)
{
updateCurrentAccessNodes();
......
......@@ -3128,13 +3128,13 @@ angle::Result ContextVk::updateActiveTextures(const gl::Context *context,
{
samplerVk = nullptr;
samplerSerial = kZeroSerial;
textureVk->onSamplerGraphAccess(&mResourceUseList);
textureVk->onSamplerUse(&mResourceUseList);
}
else
{
samplerVk = vk::GetImpl(sampler);
samplerSerial = samplerVk->getSerial();
samplerVk->onSamplerGraphAccess(&mResourceUseList);
samplerVk->onSamplerAccess(&mResourceUseList);
}
vk::ImageHelper &image = textureVk->getImage();
......@@ -3160,7 +3160,7 @@ angle::Result ContextVk::updateActiveTextures(const gl::Context *context,
image.changeLayout(aspectFlags, textureLayout, srcLayoutChange);
}
textureVk->onImageViewGraphAccess(&mResourceUseList);
textureVk->onImageViewUse(&mResourceUseList);
image.addReadDependency(this, recorder);
mActiveTextures[textureUnit].texture = textureVk;
......
......@@ -162,7 +162,7 @@ angle::Result FramebufferVk::invalidate(const gl::Context *context,
const GLenum *attachments)
{
ContextVk *contextVk = vk::GetImpl(context);
mFramebuffer.onGraphAccess(&contextVk->getResourceUseList());
mFramebuffer.onResourceAccess(&contextVk->getResourceUseList());
if (mFramebuffer.valid() && mFramebuffer.hasStartedRenderPass())
{
......@@ -178,7 +178,7 @@ angle::Result FramebufferVk::invalidateSub(const gl::Context *context,
const gl::Rectangle &area)
{
ContextVk *contextVk = vk::GetImpl(context);
mFramebuffer.onGraphAccess(&contextVk->getResourceUseList());
mFramebuffer.onResourceAccess(&contextVk->getResourceUseList());
// RenderPass' storeOp cannot be made conditional to a specific region, so we only apply this
// hint if the requested area encompasses the render area.
......@@ -774,7 +774,7 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
{
const vk::ImageView *readImageView = nullptr;
ANGLE_TRY(readRenderTarget->getImageView(contextVk, &readImageView));
readRenderTarget->onImageViewGraphAccess(contextVk);
readRenderTarget->onImageViewAccess(contextVk);
ANGLE_TRY(utilsVk.colorBlitResolve(contextVk, this, &readRenderTarget->getImage(),
readImageView, params));
}
......
......@@ -1248,7 +1248,7 @@ void ProgramVk::updateDefaultUniformsDescriptorSet(ContextVk *contextVk)
}
else
{
mEmptyBuffer.onGraphAccess(&contextVk->getResourceUseList());
mEmptyBuffer.onResourceAccess(&contextVk->getResourceUseList());
bufferInfo.buffer = mEmptyBuffer.getBuffer().getHandle();
mDescriptorBuffersCache.emplace_back(&mEmptyBuffer);
}
......@@ -1416,7 +1416,7 @@ void ProgramVk::updateAtomicCounterBuffersDescriptorSet(ContextVk *contextVk,
}
// Bind the empty buffer to every array slot that's unused.
mEmptyBuffer.onGraphAccess(&contextVk->getResourceUseList());
mEmptyBuffer.onResourceAccess(&contextVk->getResourceUseList());
for (size_t binding : ~writtenBindings)
{
VkDescriptorBufferInfo &bufferInfo = descriptorBufferInfo[binding];
......@@ -1779,7 +1779,7 @@ angle::Result ProgramVk::updateDescriptorSets(ContextVk *contextVk,
for (vk::BufferHelper *buffer : mDescriptorBuffersCache)
{
buffer->onGraphAccess(&contextVk->getResourceUseList());
buffer->onResourceAccess(&contextVk->getResourceUseList());
}
return angle::Result::Continue;
......
......@@ -68,7 +68,7 @@ angle::Result RenderTargetVk::onColorDraw(ContextVk *contextVk,
// Set up dependencies between the RT resource and the Framebuffer.
mImage->addWriteDependency(contextVk, framebufferVk);
onImageViewGraphAccess(contextVk);
onImageViewAccess(contextVk);
return angle::Result::Continue;
}
......@@ -89,7 +89,7 @@ angle::Result RenderTargetVk::onDepthStencilDraw(ContextVk *contextVk,
// Set up dependencies between the RT resource and the Framebuffer.
mImage->addWriteDependency(contextVk, framebufferVk);
onImageViewGraphAccess(contextVk);
onImageViewAccess(contextVk);
return angle::Result::Continue;
}
......@@ -157,7 +157,7 @@ vk::ImageHelper *RenderTargetVk::getImageForRead(ContextVk *contextVk,
// to perform the layout transition and set the dependency.
mImage->addWriteDependency(contextVk, readingResource);
mImage->changeLayout(mImage->getAspectFlags(), layout, commandBuffer);
onImageViewGraphAccess(contextVk);
onImageViewAccess(contextVk);
return mImage;
}
......@@ -166,7 +166,7 @@ vk::ImageHelper *RenderTargetVk::getImageForWrite(ContextVk *contextVk,
{
ASSERT(mImage && mImage->valid());
mImage->addWriteDependency(contextVk, writingResource);
onImageViewGraphAccess(contextVk);
onImageViewAccess(contextVk);
return mImage;
}
......@@ -182,8 +182,8 @@ angle::Result RenderTargetVk::flushStagedUpdates(ContextVk *contextVk)
mLayerIndex + 1, commandBuffer);
}
void RenderTargetVk::onImageViewGraphAccess(ContextVk *contextVk) const
void RenderTargetVk::onImageViewAccess(ContextVk *contextVk) const
{
mImageViews->onGraphAccess(&contextVk->getResourceUseList());
mImageViews->onResourceAccess(&contextVk->getResourceUseList());
}
} // namespace rx
......@@ -82,7 +82,7 @@ class RenderTargetVk final : public FramebufferAttachmentRenderTarget
angle::Result flushStagedUpdates(ContextVk *contextVk);
void onImageViewGraphAccess(ContextVk *contextVk) const;
void onImageViewAccess(ContextVk *contextVk) const;
private:
vk::ImageHelper *mImage;
......
......@@ -34,9 +34,9 @@ class SamplerVk : public SamplerImpl
Serial getSerial() const { return mSerial; }
void onSamplerGraphAccess(vk::ResourceUseList *resourceUseList)
void onSamplerAccess(vk::ResourceUseList *resourceUseList)
{
mSampler.onGraphAccess(resourceUseList);
mSampler.onResourceAccess(resourceUseList);
}
private:
......
......@@ -447,7 +447,7 @@ angle::Result TextureVk::copySubImageImpl(const gl::Context *context,
const vk::ImageView *readImageView = nullptr;
ANGLE_TRY(colorReadRT->getImageView(contextVk, &readImageView));
colorReadRT->onImageViewGraphAccess(contextVk);
colorReadRT->onImageViewAccess(contextVk);
return copySubImageImplWithDraw(contextVk, offsetImageIndex, modifiedDestOffset, destFormat,
0, clippedSourceArea, isViewportFlipY, false, false, false,
......@@ -1597,7 +1597,7 @@ const vk::ImageView &TextureVk::getReadImageViewAndRecordUse(ContextVk *contextV
{
ASSERT(mImage->valid());
mImageViews.onGraphAccess(&contextVk->getResourceUseList());
mImageViews.onResourceAccess(&contextVk->getResourceUseList());
if (mState.isStencilMode() && mImageViews.hasStencilReadImageView())
{
......@@ -1611,7 +1611,7 @@ const vk::ImageView &TextureVk::getFetchImageViewAndRecordUse(ContextVk *context
{
ASSERT(mImage->valid());
mImageViews.onGraphAccess(&contextVk->getResourceUseList());
mImageViews.onResourceAccess(&contextVk->getResourceUseList());
// We don't currently support fetch for depth/stencil cube map textures.
ASSERT(!mImageViews.hasStencilReadImageView() || !mImageViews.hasFetchImageView());
......
......@@ -179,14 +179,14 @@ class TextureVk : public TextureImpl
return *mImage;
}
void onImageViewGraphAccess(vk::ResourceUseList *resourceUseList)
void onImageViewUse(vk::ResourceUseList *resourceUseList)
{
mImageViews.onGraphAccess(resourceUseList);
mImageViews.onResourceAccess(resourceUseList);
}
void onSamplerGraphAccess(vk::ResourceUseList *resourceUseList)
void onSamplerUse(vk::ResourceUseList *resourceUseList)
{
mSampler.onGraphAccess(resourceUseList);
mSampler.onResourceAccess(resourceUseList);
}
void releaseOwnershipOfImage(const gl::Context *context);
......
......@@ -1546,7 +1546,7 @@ angle::Result UtilsVk::stencilBlitResolveNoShaderExport(ContextVk *contextVk,
ANGLE_TRY(
blitBuffer.get().init(contextVk, blitBufferInfo, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT));
blitBuffer.get().onGraphAccess(&contextVk->getResourceUseList());
blitBuffer.get().onResourceAccess(&contextVk->getResourceUseList());
BlitResolveStencilNoExportShaderParams shaderParams;
if (isResolve)
......
......@@ -2905,7 +2905,7 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
BufferHelper *currentBuffer = bufferUpdate.bufferHelper;
ASSERT(currentBuffer && currentBuffer->valid());
currentBuffer->onGraphAccess(&contextVk->getResourceUseList());
currentBuffer->onResourceAccess(&contextVk->getResourceUseList());
commandBuffer->copyBufferToImage(currentBuffer->getBuffer().getHandle(), mImage,
getCurrentLayout(), 1, &update.buffer.copyRegion);
......@@ -3205,7 +3205,7 @@ angle::Result ImageHelper::readPixels(ContextVk *contextVk,
ANGLE_TRY(resolvedImage.get().init2DStaging(
contextVk, renderer->getMemoryProperties(), gl::Extents(area.width, area.height, 1),
*mFormat, VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT, 1));
resolvedImage.get().onGraphAccess(&contextVk->getResourceUseList());
resolvedImage.get().onResourceAccess(&contextVk->getResourceUseList());
// Note: resolve only works on color images (not depth/stencil).
//
......@@ -3484,7 +3484,7 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk,
uint32_t layer,
const ImageView **imageViewOut)
{
onGraphAccess(&contextVk->getResourceUseList());
onResourceAccess(&contextVk->getResourceUseList());
// TODO(http://anglebug.com/4008): Possibly incorrect level count.
ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, level, 1);
......@@ -3509,7 +3509,7 @@ angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk,
ASSERT(image.valid());
ASSERT(!image.getFormat().actualImageFormat().isBlock);
onGraphAccess(&contextVk->getResourceUseList());
onResourceAccess(&contextVk->getResourceUseList());
uint32_t layerCount = GetImageLayerCountForView(image);
......
......@@ -1077,7 +1077,7 @@ class ImageViewHelper : angle::NonCopyable
bool hasFetchImageView() const { return mFetchImageView.valid(); }
// Store reference to usage in graph.
void onGraphAccess(ResourceUseList *resourceUseList) const { resourceUseList->add(mUse); }
void onResourceAccess(ResourceUseList *resourceUseList) const { resourceUseList->add(mUse); }
// Creates views with multiple layers and levels.
angle::Result initReadViews(ContextVk *contextVk,
......@@ -1132,7 +1132,7 @@ class SamplerHelper final : angle::NonCopyable
Sampler &get() { return mSampler; }
const Sampler &get() const { return mSampler; }
void onGraphAccess(ResourceUseList *resourceUseList) { resourceUseList->add(mUse); }
void onResourceAccess(ResourceUseList *resourceUseList) { resourceUseList->add(mUse); }
private:
SharedResourceUse mUse;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment