Skip to content

A
angle
Commit 135a5843 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Remove redundant vk prefixes in vk_helpers.

Cleanup/refactoring only. Bug: angleproject:4911 Change-Id: I4fe06a86a6ecaafa16fd900b6f6229f09ab56a9f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2334092 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com>
parent e3988722
Showing with 66 additions and 66 deletions
src/libANGLE/renderer/vulkan/vk_helpers.cpp
......@@ -294,7 +294,7 @@ constexpr angle::PackedEnumMap<ImageLayout, ImageMemoryBarrierData> kImageMemory
// Transition from: all writes must finish before barrier.
VK_ACCESS_SHADER_WRITE_BIT,
true,
vk::PipelineStage::ComputeShader,
PipelineStage::ComputeShader,
},
},
{
......@@ -503,7 +503,7 @@ const angle::Format &GetDepthStencilImageToBufferFormat(const angle::Format &ima
}
}
VkClearValue GetRobustResourceClearValue(const vk::Format &format)
VkClearValue GetRobustResourceClearValue(const Format &format)
{
VkClearValue clearValue;
if (format.intendedFormat().hasDepthOrStencilBits())
......@@ -578,10 +578,10 @@ bool CommandBufferHelper::usesBufferForWrite(const BufferHelper &buffer) const
return iter != mUsedBuffers.end() && iter->second == BufferAccess::Write;
}
void CommandBufferHelper::bufferRead(vk::ResourceUseList *resourceUseList,
void CommandBufferHelper::bufferRead(ResourceUseList *resourceUseList,
VkAccessFlags readAccessType,
vk::PipelineStage readStage,
vk::BufferHelper *buffer)
PipelineStage readStage,
BufferHelper *buffer)
{
buffer->retain(resourceUseList);
VkPipelineStageFlagBits stageBits = kPipelineStageFlagBitMap[readStage];
......@@ -594,11 +594,11 @@ void CommandBufferHelper::bufferRead(vk::ResourceUseList *resourceUseList,
mUsedBuffers[buffer->getBufferSerial()] = BufferAccess::Read;
}
void CommandBufferHelper::bufferWrite(vk::ResourceUseList *resourceUseList,
void CommandBufferHelper::bufferWrite(ResourceUseList *resourceUseList,
VkAccessFlags writeAccessType,
vk::PipelineStage writeStage,
PipelineStage writeStage,
BufferAliasingMode aliasingMode,
vk::BufferHelper *buffer)
BufferHelper *buffer)
{
buffer->retain(resourceUseList);
VkPipelineStageFlagBits stageBits = kPipelineStageFlagBitMap[writeStage];
......@@ -618,10 +618,10 @@ void CommandBufferHelper::bufferWrite(vk::ResourceUseList *resourceUseList,
}
}
void CommandBufferHelper::imageRead(vk::ResourceUseList *resourceUseList,
void CommandBufferHelper::imageRead(ResourceUseList *resourceUseList,
VkImageAspectFlags aspectFlags,
vk::ImageLayout imageLayout,
vk::ImageHelper *image)
ImageLayout imageLayout,
ImageHelper *image)
{
image->retain(resourceUseList);
if (image->isLayoutChangeNecessary(imageLayout))
......@@ -636,10 +636,10 @@ void CommandBufferHelper::imageRead(vk::ResourceUseList *resourceUseList,
}
}
void CommandBufferHelper::imageWrite(vk::ResourceUseList *resourceUseList,
void CommandBufferHelper::imageWrite(ResourceUseList *resourceUseList,
VkImageAspectFlags aspectFlags,
vk::ImageLayout imageLayout,
vk::ImageHelper *image)
ImageLayout imageLayout,
ImageHelper *image)
{
image->retain(resourceUseList);
image->onWrite();
......@@ -653,7 +653,7 @@ void CommandBufferHelper::imageWrite(vk::ResourceUseList *resourceUseList,
}
}
void CommandBufferHelper::executeBarriers(vk::PrimaryCommandBuffer *primary)
void CommandBufferHelper::executeBarriers(PrimaryCommandBuffer *primary)
{
// make a local copy for faster access
PipelineStagesMask mask = mPipelineBarrierMask;
......@@ -683,13 +683,13 @@ void CommandBufferHelper::executeBarriers(vk::PrimaryCommandBuffer *primary)
mPipelineBarrierMask.reset();
}
void CommandBufferHelper::beginRenderPass(const vk::Framebuffer &framebuffer,
void CommandBufferHelper::beginRenderPass(const Framebuffer &framebuffer,
const gl::Rectangle &renderArea,
const vk::RenderPassDesc &renderPassDesc,
const vk::AttachmentOpsArray &renderPassAttachmentOps,
const RenderPassDesc &renderPassDesc,
const AttachmentOpsArray &renderPassAttachmentOps,
const uint32_t depthStencilAttachmentIndex,
const vk::ClearValuesArray &clearValues,
vk::CommandBuffer **commandBufferOut)
const ClearValuesArray &clearValues,
CommandBuffer **commandBufferOut)
{
ASSERT(mIsRenderPassCommandBuffer);
ASSERT(empty());
......@@ -754,7 +754,7 @@ void CommandBufferHelper::endTransformFeedback()
}
angle::Result CommandBufferHelper::flushToPrimary(ContextVk *contextVk,
vk::PrimaryCommandBuffer *primary)
PrimaryCommandBuffer *primary)
{
ANGLE_TRACE_EVENT0("gpu.angle", "CommandBufferHelper::flushToPrimary");
ASSERT(!empty());
......@@ -772,7 +772,7 @@ angle::Result CommandBufferHelper::flushToPrimary(ContextVk *contextVk,
RenderPassCache &renderPassCache = contextVk->getRenderPassCache();
Serial serial = contextVk->getCurrentQueueSerial();
vk::RenderPass *renderPass = nullptr;
RenderPass *renderPass = nullptr;
ANGLE_TRY(renderPassCache.getRenderPassWithOps(contextVk, serial, mRenderPassDesc,
mAttachmentOps, &renderPass));
......@@ -1759,7 +1759,7 @@ void QueryHelper::resetQueryPool(ContextVk *contextVk,
angle::Result QueryHelper::beginQuery(ContextVk *contextVk)
{
vk::CommandBuffer *outsideRenderPassCommandBuffer;
CommandBuffer *outsideRenderPassCommandBuffer;
ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&outsideRenderPassCommandBuffer));
const QueryPool &queryPool = getQueryPool();
outsideRenderPassCommandBuffer->resetQueryPool(queryPool.getHandle(), mQuery, 1);
......@@ -1770,7 +1770,7 @@ angle::Result QueryHelper::beginQuery(ContextVk *contextVk)
angle::Result QueryHelper::endQuery(ContextVk *contextVk)
{
vk::CommandBuffer *outsideRenderPassCommandBuffer;
CommandBuffer *outsideRenderPassCommandBuffer;
ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&outsideRenderPassCommandBuffer));
outsideRenderPassCommandBuffer->endQuery(getQueryPool().getHandle(), mQuery);
mMostRecentSerial = contextVk->getCurrentQueueSerial();
......@@ -1793,7 +1793,7 @@ void QueryHelper::endOcclusionQuery(ContextVk *contextVk, CommandBuffer *renderP
angle::Result QueryHelper::flushAndWriteTimestamp(ContextVk *contextVk)
{
vk::CommandBuffer *outsideRenderPassCommandBuffer;
CommandBuffer *outsideRenderPassCommandBuffer;
ANGLE_TRY(contextVk->endRenderPassAndGetCommandBuffer(&outsideRenderPassCommandBuffer));
writeTimestamp(contextVk, outsideRenderPassCommandBuffer);
return angle::Result::Continue;
......@@ -2298,8 +2298,8 @@ angle::Result BufferHelper::init(ContextVk *contextVk,
VkMemoryPropertyFlags preferredFlags =
(memoryPropertyFlags & (~VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT));
const vk::Allocator &allocator = renderer->getAllocator();
bool persistentlyMapped = renderer->getFeatures().persistentlyMappedBuffers.enabled;
const Allocator &allocator = renderer->getAllocator();
bool persistentlyMapped = renderer->getFeatures().persistentlyMappedBuffers.enabled;
// Check that the allocation is not too large.
uint32_t memoryTypeIndex = 0;
......@@ -2350,7 +2350,7 @@ angle::Result BufferHelper::initializeNonZeroMemory(Context *context, VkDeviceSi
RendererVk *renderer = context->getRenderer();
vk::PrimaryCommandBuffer commandBuffer;
PrimaryCommandBuffer commandBuffer;
ANGLE_TRY(renderer->getCommandBufferOneOff(context, &commandBuffer));
// Queue a DMA copy.
......@@ -2743,21 +2743,21 @@ angle::Result ImageHelper::initializeNonZeroMemory(Context *context, VkDeviceSiz
RendererVk *renderer = context->getRenderer();
vk::PrimaryCommandBuffer commandBuffer;
PrimaryCommandBuffer commandBuffer;
ANGLE_TRY(renderer->getCommandBufferOneOff(context, &commandBuffer));
// Queue a DMA copy.
forceChangeLayoutAndQueue(getAspectFlags(), ImageLayout::TransferDst, mCurrentQueueFamilyIndex,
&commandBuffer);
vk::StagingBuffer stagingBuffer;
StagingBuffer stagingBuffer;
if (isCompressedFormat)
{
// If format is compressed, set its contents through buffer copies.
// The staging buffer memory is non-zero-initialized in 'init'.
ANGLE_TRY(stagingBuffer.init(context, size, vk::StagingUsage::Write));
ANGLE_TRY(stagingBuffer.init(context, size, StagingUsage::Write));
for (uint32_t level = 0; level < mLevelCount; ++level)
{
......@@ -2967,7 +2967,7 @@ angle::Result ImageHelper::initLayerImageViewImpl(
yuvConversionInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO;
yuvConversionInfo.pNext = nullptr;
yuvConversionInfo.conversion = mYuvConversionSampler.get().getHandle();
vk::AddToPNextChain(&viewInfo, &yuvConversionInfo);
AddToPNextChain(&viewInfo, &yuvConversionInfo);
}
ANGLE_VK_TRY(context, imageViewOut->init(context->getDevice(), viewInfo));
return angle::Result::Continue;
......@@ -4020,7 +4020,7 @@ void ImageHelper::stageRobustResourceClear(const gl::ImageIndex &index)
angle::Result ImageHelper::stageRobustResourceClearWithFormat(ContextVk *contextVk,
const gl::ImageIndex &index,
const gl::Extents &glExtents,
const vk::Format &format)
const Format &format)
{
const angle::Format &imageFormat = format.actualImageFormat();
const VkImageAspectFlags aspectFlags = GetFormatAspectFlags(imageFormat);
......@@ -4098,7 +4098,7 @@ void ImageHelper::stageClearIfEmulatedFormat(Context *context)
void ImageHelper::stageSelfForBaseLevel()
{
std::unique_ptr<vk::ImageHelper> prevImage = std::make_unique<vk::ImageHelper>();
std::unique_ptr<ImageHelper> prevImage = std::make_unique<ImageHelper>();
// Move the necessary information for staged update to work, and keep the rest as part of this
// object.
......@@ -4687,7 +4687,7 @@ angle::Result ImageHelper::readPixelsForGetImage(ContextVk *contextVk,
&params, &outputSkipBytes));
// Use a temporary staging buffer. Could be optimized.
vk::RendererScoped<vk::DynamicBuffer> stagingBuffer(contextVk->getRenderer());
RendererScoped<DynamicBuffer> stagingBuffer(contextVk->getRenderer());
stagingBuffer.get().init(contextVk->getRenderer(), VK_BUFFER_USAGE_TRANSFER_DST_BIT, 1,
kStagingBufferSize, true);
......@@ -5109,7 +5109,7 @@ void ImageViewHelper::destroy(VkDevice device)
}
mLayerLevelDrawImageViews.clear();
mImageViewSerial = vk::kInvalidImageViewSerial;
mImageViewSerial = kInvalidImageViewSerial;
}
angle::Result ImageViewHelper::initReadViews(ContextVk *contextVk,
......
src/libANGLE/renderer/vulkan/vk_helpers.h
......@@ -43,7 +43,7 @@ using StagingBufferOffsetArray = std::array<VkDeviceSize, 2>;
struct TextureUnit final
{
TextureVk *texture;
const vk::SamplerHelper *sampler;
const SamplerHelper *sampler;
};
// A dynamic buffer is conceptually an infinitely long buffer. Each time you write to the buffer,
......@@ -860,31 +860,31 @@ struct CommandBufferHelper : angle::NonCopyable
// General Functions (non-renderPass specific)
void initialize(bool isRenderPassCommandBuffer, bool mergeBarriers);
void bufferRead(vk::ResourceUseList *resourceUseList,
void bufferRead(ResourceUseList *resourceUseList,
VkAccessFlags readAccessType,
vk::PipelineStage readStage,
vk::BufferHelper *buffer);
void bufferWrite(vk::ResourceUseList *resourceUseList,
PipelineStage readStage,
BufferHelper *buffer);
void bufferWrite(ResourceUseList *resourceUseList,
VkAccessFlags writeAccessType,
vk::PipelineStage writeStage,
PipelineStage writeStage,
BufferAliasingMode aliasingMode,
vk::BufferHelper *buffer);
BufferHelper *buffer);
void imageRead(vk::ResourceUseList *resourceUseList,
void imageRead(ResourceUseList *resourceUseList,
VkImageAspectFlags aspectFlags,
vk::ImageLayout imageLayout,
vk::ImageHelper *image);
ImageLayout imageLayout,
ImageHelper *image);
void imageWrite(vk::ResourceUseList *resourceUseList,
void imageWrite(ResourceUseList *resourceUseList,
VkImageAspectFlags aspectFlags,
vk::ImageLayout imageLayout,
vk::ImageHelper *image);
ImageLayout imageLayout,
ImageHelper *image);
vk::CommandBuffer &getCommandBuffer() { return mCommandBuffer; }
CommandBuffer &getCommandBuffer() { return mCommandBuffer; }
angle::Result flushToPrimary(ContextVk *contextVk, vk::PrimaryCommandBuffer *primary);
angle::Result flushToPrimary(ContextVk *contextVk, PrimaryCommandBuffer *primary);
void executeBarriers(vk::PrimaryCommandBuffer *primary);
void executeBarriers(PrimaryCommandBuffer *primary);
void setHasRenderPass(bool hasRenderPass) { mIsRenderPassCommandBuffer = hasRenderPass; }
void reset();
......@@ -905,13 +905,13 @@ struct CommandBufferHelper : angle::NonCopyable
return mRenderPassStarted;
}
void beginRenderPass(const vk::Framebuffer &framebuffer,
void beginRenderPass(const Framebuffer &framebuffer,
const gl::Rectangle &renderArea,
const vk::RenderPassDesc &renderPassDesc,
const vk::AttachmentOpsArray &renderPassAttachmentOps,
const RenderPassDesc &renderPassDesc,
const AttachmentOpsArray &renderPassAttachmentOps,
const uint32_t depthStencilAttachmentIndex,
const vk::ClearValuesArray &clearValues,
vk::CommandBuffer **commandBufferOut);
const ClearValuesArray &clearValues,
CommandBuffer **commandBufferOut);
void endRenderPass();
......@@ -940,7 +940,7 @@ struct CommandBufferHelper : angle::NonCopyable
VK_ATTACHMENT_STORE_OP_DONT_CARE);
}
void updateRenderPassAttachmentFinalLayout(size_t attachmentIndex, vk::ImageLayout finalLayout)
void updateRenderPassAttachmentFinalLayout(size_t attachmentIndex, ImageLayout finalLayout)
{
ASSERT(mIsRenderPassCommandBuffer);
SetBitField(mAttachmentOps[attachmentIndex].finalLayout, finalLayout);
......@@ -987,15 +987,15 @@ struct CommandBufferHelper : angle::NonCopyable
// General state (non-renderPass related)
PipelineBarrierArray mPipelineBarriers;
PipelineStagesMask mPipelineBarrierMask;
vk::CommandBuffer mCommandBuffer;
CommandBuffer mCommandBuffer;
// RenderPass state
uint32_t mCounter;
vk::RenderPassDesc mRenderPassDesc;
vk::AttachmentOpsArray mAttachmentOps;
vk::Framebuffer mFramebuffer;
RenderPassDesc mRenderPassDesc;
AttachmentOpsArray mAttachmentOps;
Framebuffer mFramebuffer;
gl::Rectangle mRenderArea;
vk::ClearValuesArray mClearValues;
ClearValuesArray mClearValues;
bool mRenderPassStarted;
// Transform feedback state
......@@ -1300,7 +1300,7 @@ class ImageHelper final : public Resource, public angle::Subject
angle::Result stageRobustResourceClearWithFormat(ContextVk *contextVk,
const gl::ImageIndex &index,
const gl::Extents &glExtents,
const vk::Format &format);
const Format &format);
void stageRobustResourceClear(const gl::ImageIndex &index);
// Stage the currently allocated image as an update to base level, making this !valid(). This
......@@ -1586,7 +1586,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkPipelineStageFlags mCurrentShaderReadStageMask;
// For imported images
vk::BindingPointer<vk::SamplerYcbcrConversion> mYuvConversionSampler;
BindingPointer<SamplerYcbcrConversion> mYuvConversionSampler;
uint64_t mExternalFormat;
// Cached properties.
......@@ -1936,7 +1936,7 @@ class ShaderProgramHelper : angle::NonCopyable
PipelineAndSerial mComputePipeline;
// Specialization constants, currently only used by the graphics queue.
vk::SpecializationConstantBitSet mSpecializationConstants;
SpecializationConstantBitSet mSpecializationConstants;
};
// Tracks current handle allocation counts in the back-end. Useful for debugging and profiling.
......
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