Skip to content

A
angle
Commit 2bdefbf8 by Jamie Madill Committed by Commit Bot
Options

Vulkan: Remove some redundant "vk" prefixes.

Refactoring change only. Found when working on multithreading CLs. Bug: angleproject:2464 Change-Id: Ide91c7134b5f565e2f122a50cf92a4938189704a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1825444Reviewed-by: 's avatarTim Van Patten <timvp@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 39d142e8
Showing with 27 additions and 27 deletions
src/libANGLE/renderer/vulkan/vk_helpers.h
......@@ -406,7 +406,7 @@ class LineLoopHelper final : angle::NonCopyable
angle::Result getIndexBufferForDrawArrays(ContextVk *contextVk,
uint32_t clampedVertexCount,
GLint firstVertex,
vk::BufferHelper **bufferOut,
BufferHelper **bufferOut,
VkDeviceSize *offsetOut);
angle::Result getIndexBufferForElementArrayBuffer(ContextVk *contextVk,
......@@ -414,7 +414,7 @@ class LineLoopHelper final : angle::NonCopyable
gl::DrawElementsType glIndexType,
int indexCount,
intptr_t elementArrayOffset,
vk::BufferHelper **bufferOut,
BufferHelper **bufferOut,
VkDeviceSize *bufferOffsetOut,
uint32_t *indexCountOut);
......@@ -422,14 +422,14 @@ class LineLoopHelper final : angle::NonCopyable
gl::DrawElementsType glIndexType,
GLsizei indexCount,
const uint8_t *srcPtr,
vk::BufferHelper **bufferOut,
BufferHelper **bufferOut,
VkDeviceSize *bufferOffsetOut,
uint32_t *indexCountOut);
void release(ContextVk *contextVk);
void destroy(VkDevice device);
static void Draw(uint32_t count, vk::CommandBuffer *commandBuffer);
static void Draw(uint32_t count, CommandBuffer *commandBuffer);
private:
DynamicBuffer mDynamicIndexBuffer;
......@@ -644,7 +644,7 @@ class ImageHelper final : public CommandGraphResource
~ImageHelper() override;
void initStagingBuffer(RendererVk *renderer,
const vk::Format &format,
const Format &format,
VkBufferUsageFlags usageFlags,
size_t initialSize);
......@@ -741,7 +741,7 @@ class ImageHelper final : public CommandGraphResource
uint32_t mipLevel,
uint32_t baseArrayLayer,
uint32_t layerCount,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
gl::Extents getSize(const gl::ImageIndex &index) const;
......@@ -752,13 +752,13 @@ class ImageHelper final : public CommandGraphResource
const gl::Extents &copySize,
const VkImageSubresourceLayers &srcSubresources,
const VkImageSubresourceLayers &dstSubresources,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
angle::Result generateMipmapsWithBlit(ContextVk *contextVk, GLuint maxLevel);
// Resolve this image into a destination image. This image should be in the TransferSrc layout.
// The destination image is automatically transitioned into TransferDst.
void resolve(ImageHelper *dest, const VkImageResolve &region, vk::CommandBuffer *commandBuffer);
void resolve(ImageHelper *dest, const VkImageResolve &region, CommandBuffer *commandBuffer);
// Data staging
void removeStagedUpdates(ContextVk *contextVk, const gl::ImageIndex &index);
......@@ -771,7 +771,7 @@ class ImageHelper final : public CommandGraphResource
const gl::PixelUnpackState &unpack,
GLenum type,
const uint8_t *pixels,
const vk::Format &vkFormat);
const Format &vkFormat);
angle::Result stageSubresourceUpdateAndGetData(ContextVk *contextVk,
size_t allocationSize,
......@@ -788,7 +788,7 @@ class ImageHelper final : public CommandGraphResource
const gl::InternalFormat &formatInfo,
FramebufferVk *framebufferVk);
void stageSubresourceUpdateFromImage(vk::ImageHelper *image,
void stageSubresourceUpdateFromImage(ImageHelper *image,
const gl::ImageIndex &index,
const gl::Offset &destOffset,
const gl::Extents &glExtents,
......@@ -822,7 +822,7 @@ class ImageHelper final : public CommandGraphResource
uint32_t levelEnd,
uint32_t layerStart,
uint32_t layerEnd,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
// Creates a command buffer and flushes all staged updates. This is used for one-time
// initialization of resources that we don't expect to accumulate further staged updates, such
// as with renderbuffers or surface images.
......@@ -837,7 +837,7 @@ class ImageHelper final : public CommandGraphResource
void changeLayout(VkImageAspectFlags aspectMask,
ImageLayout newLayout,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
bool isQueueChangeNeccesary(uint32_t newQueueFamilyIndex) const
{
......@@ -847,13 +847,13 @@ class ImageHelper final : public CommandGraphResource
void changeLayoutAndQueue(VkImageAspectFlags aspectMask,
ImageLayout newLayout,
uint32_t newQueueFamilyIndex,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
private:
void forceChangeLayoutAndQueue(VkImageAspectFlags aspectMask,
ImageLayout newLayout,
uint32_t newQueueFamilyIndex,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
void stageSubresourceClear(const gl::ImageIndex &index,
const angle::Format &format,
......@@ -865,7 +865,7 @@ class ImageHelper final : public CommandGraphResource
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
void clearDepthStencil(VkImageAspectFlags imageAspectFlags,
VkImageAspectFlags clearAspectFlags,
......@@ -874,13 +874,13 @@ class ImageHelper final : public CommandGraphResource
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount,
vk::CommandBuffer *commandBuffer);
CommandBuffer *commandBuffer);
struct SubresourceUpdate
{
SubresourceUpdate();
SubresourceUpdate(VkBuffer bufferHandle, const VkBufferImageCopy &copyRegion);
SubresourceUpdate(vk::ImageHelper *image, const VkImageCopy &copyRegion);
SubresourceUpdate(ImageHelper *image, const VkImageCopy &copyRegion);
SubresourceUpdate(const VkClearValue &clearValue, const gl::ImageIndex &imageIndex);
SubresourceUpdate(const SubresourceUpdate &other);
......@@ -915,7 +915,7 @@ class ImageHelper final : public CommandGraphResource
};
struct ImageUpdate
{
vk::ImageHelper *image;
ImageHelper *image;
VkImageCopy copyRegion;
};
......@@ -946,7 +946,7 @@ class ImageHelper final : public CommandGraphResource
uint32_t mLevelCount;
// Staging buffer
vk::DynamicBuffer mStagingBuffer;
DynamicBuffer mStagingBuffer;
std::vector<SubresourceUpdate> mSubresourceUpdates;
};
......@@ -1004,11 +1004,11 @@ class ShaderProgramHelper : angle::NonCopyable
return mShaders[gl::ShaderType::Vertex].valid();
}
vk::ShaderAndSerial &getShader(gl::ShaderType shaderType) { return mShaders[shaderType].get(); }
ShaderAndSerial &getShader(gl::ShaderType shaderType) { return mShaders[shaderType].get(); }
void setShader(gl::ShaderType shaderType, RefCounted<ShaderAndSerial> *shader);
// For getting a vk::Pipeline and from the pipeline cache.
// For getting a Pipeline and from the pipeline cache.
ANGLE_INLINE angle::Result getGraphicsPipeline(
ContextVk *contextVk,
RenderPassCache *renderPassCache,
......@@ -1018,11 +1018,11 @@ class ShaderProgramHelper : angle::NonCopyable
const GraphicsPipelineDesc &pipelineDesc,
const gl::AttributesMask &activeAttribLocationsMask,
const gl::ComponentTypeMask &programAttribsTypeMask,
const vk::GraphicsPipelineDesc **descPtrOut,
const GraphicsPipelineDesc **descPtrOut,
PipelineHelper **pipelineOut)
{
// Pull in a compatible RenderPass.
vk::RenderPass *compatibleRenderPass = nullptr;
RenderPass *compatibleRenderPass = nullptr;
ANGLE_TRY(renderPassCache->getCompatibleRenderPass(contextVk, currentQueueSerial,
pipelineDesc.getRenderPassDesc(),
&compatibleRenderPass));
......
src/libANGLE/renderer/vulkan/vk_utils.h
......@@ -295,19 +295,19 @@ class StagingBuffer final : angle::NonCopyable
size_t mSize;
};
angle::Result AllocateBufferMemory(vk::Context *context,
angle::Result AllocateBufferMemory(Context *context,
VkMemoryPropertyFlags requestedMemoryPropertyFlags,
VkMemoryPropertyFlags *memoryPropertyFlagsOut,
const void *extraAllocationInfo,
Buffer *buffer,
DeviceMemory *deviceMemoryOut);
angle::Result AllocateImageMemory(vk::Context *context,
angle::Result AllocateImageMemory(Context *context,
VkMemoryPropertyFlags memoryPropertyFlags,
const void *extraAllocationInfo,
Image *image,
DeviceMemory *deviceMemoryOut);
angle::Result AllocateImageMemoryWithRequirements(vk::Context *context,
angle::Result AllocateImageMemoryWithRequirements(Context *context,
VkMemoryPropertyFlags memoryPropertyFlags,
const VkMemoryRequirements &memoryRequirements,
const void *extraAllocationInfo,
......@@ -566,7 +566,7 @@ bool SamplerNameContainsNonZeroArrayElement(const std::string &name);
std::string GetMappedSamplerName(const std::string &originalName);
// A vector of image views, such as one per level or one per layer.
using ImageViewVector = std::vector<vk::ImageView>;
using ImageViewVector = std::vector<ImageView>;
// A vector of vector of image views. Primary index is layer, secondary index is level.
using LayerLevelImageViewVector = std::vector<ImageViewVector>;
......
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