Skip to content

A
angle
Commit 22d30378 by Shahbaz Youssefi Committed by Commit Bot
Options

Vulkan: Change VK suffix to Vk

For consistency with the rest of the backend. Level index variables were using the VK suffix while color index variables used Vk. Bug: angleproject:4881 Change-Id: I0c2799da34cdfe19cb04adbebba042ac8876af96 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2413155 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
parent 71e7a5a6
Showing with 42 additions and 42 deletions
src/libANGLE/renderer/vulkan/FramebufferVk.cpp
......@@ -798,13 +798,13 @@ angle::Result FramebufferVk::blitWithCommand(ContextVk *contextVk,
VkImageBlit blit = {};
blit.srcSubresource.aspectMask = blitAspectMask;
blit.srcSubresource.mipLevel = srcImage->toVKLevel(readRenderTarget->getLevelIndex()).get();
blit.srcSubresource.mipLevel = srcImage->toVkLevel(readRenderTarget->getLevelIndex()).get();
blit.srcSubresource.baseArrayLayer = readRenderTarget->getLayerIndex();
blit.srcSubresource.layerCount = 1;
blit.srcOffsets[0] = {sourceArea.x0(), sourceArea.y0(), 0};
blit.srcOffsets[1] = {sourceArea.x1(), sourceArea.y1(), 1};
blit.dstSubresource.aspectMask = blitAspectMask;
blit.dstSubresource.mipLevel = dstImage->toVKLevel(drawRenderTarget->getLevelIndex()).get();
blit.dstSubresource.mipLevel = dstImage->toVkLevel(drawRenderTarget->getLevelIndex()).get();
blit.dstSubresource.baseArrayLayer = drawRenderTarget->getLayerIndex();
blit.dstSubresource.layerCount = 1;
blit.dstOffsets[0] = {destArea.x0(), destArea.y0(), 0};
......@@ -1181,7 +1181,7 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
vk::ImageHelper *depthStencilImage = &readRenderTarget->getImageForCopy();
vk::LevelIndex levelIndex =
depthStencilImage->toVKLevel(readRenderTarget->getLevelIndex());
depthStencilImage->toVkLevel(readRenderTarget->getLevelIndex());
uint32_t layerIndex = readRenderTarget->getLayerIndex();
gl::TextureType textureType = vk::Get2DTextureType(depthStencilImage->getLayerCount(),
depthStencilImage->getSamples());
......@@ -1337,8 +1337,8 @@ angle::Result FramebufferVk::resolveColorWithCommand(ContextVk *contextVk,
vk::CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer();
vk::ImageHelper &dstImage = drawRenderTarget->getImageForWrite();
vk::LevelIndex levelVK = dstImage.toVKLevel(drawRenderTarget->getLevelIndex());
resolveRegion.dstSubresource.mipLevel = levelVK.get();
vk::LevelIndex levelVk = dstImage.toVkLevel(drawRenderTarget->getLevelIndex());
resolveRegion.dstSubresource.mipLevel = levelVk.get();
resolveRegion.dstSubresource.baseArrayLayer = drawRenderTarget->getLayerIndex();
srcImage->resolve(&dstImage, resolveRegion, &commandBuffer);
......@@ -1367,7 +1367,7 @@ angle::Result FramebufferVk::copyResolveToMultisampedAttachment(ContextVk *conte
// There's no choice but to use a draw-based path to perform this copy.
gl::Extents extents = colorRenderTarget->getExtents();
vk::LevelIndex levelVK = src->toVKLevel(colorRenderTarget->getLevelIndex());
vk::LevelIndex levelVk = src->toVkLevel(colorRenderTarget->getLevelIndex());
uint32_t layer = colorRenderTarget->getLayerIndex();
UtilsVk::CopyImageParameters params;
......@@ -1377,7 +1377,7 @@ angle::Result FramebufferVk::copyResolveToMultisampedAttachment(ContextVk *conte
params.srcExtents[1] = extents.height;
params.destOffset[0] = 0;
params.destOffset[1] = 0;
params.srcMip = levelVK.get();
params.srcMip = levelVk.get();
params.srcLayer = layer;
params.srcHeight = extents.height;
params.srcPremultiplyAlpha = false;
......
src/libANGLE/renderer/vulkan/FramebufferVk.h
......@@ -29,7 +29,7 @@ class FramebufferVk : public FramebufferImpl
// Factory methods so we don't have to use constructors with overloads.
static FramebufferVk *CreateUserFBO(RendererVk *renderer, const gl::FramebufferState &state);
// The passed-in SurfaceVK must be destroyed after this FBO is destroyed. Our Surface code is
// The passed-in SurfaceVk must be destroyed after this FBO is destroyed. Our Surface code is
// ref-counted on the number of 'current' contexts, so we shouldn't get any dangling surface
// references. See Surface::setIsCurrent(bool).
static FramebufferVk *CreateDefaultFBO(RendererVk *renderer,
......
src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
......@@ -165,8 +165,8 @@ angle::Result RenderTargetVk::getImageViewImpl(ContextVk *contextVk,
const vk::ImageView **imageViewOut) const
{
ASSERT(image.valid() && imageViews);
vk::LevelIndex levelVK = mImage->toVKLevel(mLevelIndexGL);
return imageViews->getLevelLayerDrawImageView(contextVk, image, levelVK, mLayerIndex,
vk::LevelIndex levelVk = mImage->toVkLevel(mLevelIndexGL);
return imageViews->getLevelLayerDrawImageView(contextVk, image, levelVk, mLayerIndex,
imageViewOut);
}
......@@ -224,8 +224,8 @@ const vk::Format &RenderTargetVk::getImageFormat() const
gl::Extents RenderTargetVk::getExtents() const
{
ASSERT(mImage && mImage->valid());
vk::LevelIndex levelVK = mImage->toVKLevel(mLevelIndexGL);
return mImage->getLevelExtents2D(levelVK);
vk::LevelIndex levelVk = mImage->toVkLevel(mLevelIndexGL);
return mImage->getLevelExtents2D(levelVk);
}
void RenderTargetVk::updateSwapchainImage(vk::ImageHelper *image,
......
src/libANGLE/renderer/vulkan/SurfaceVk.cpp
......@@ -94,12 +94,12 @@ VkPresentModeKHR GetDesiredPresentMode(const std::vector<VkPresentModeKHR> &pres
return VK_PRESENT_MODE_FIFO_KHR;
}
constexpr VkImageUsageFlags kSurfaceVKImageUsageFlags =
constexpr VkImageUsageFlags kSurfaceVkImageUsageFlags =
VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
constexpr VkImageUsageFlags kSurfaceVKColorImageUsageFlags =
kSurfaceVKImageUsageFlags | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
constexpr VkImageUsageFlags kSurfaceVKDepthStencilImageUsageFlags =
kSurfaceVKImageUsageFlags | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
constexpr VkImageUsageFlags kSurfaceVkColorImageUsageFlags =
kSurfaceVkImageUsageFlags | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
constexpr VkImageUsageFlags kSurfaceVkDepthStencilImageUsageFlags =
kSurfaceVkImageUsageFlags | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
// If the device is rotated with any of the following transform flags, the swapchain width and
// height must be swapped (e.g. make a landscape window portrait). This must also be done for all
......@@ -165,8 +165,8 @@ angle::Result OffscreenSurfaceVk::AttachmentImage::initialize(DisplayVk *display
const angle::Format &textureFormat = vkFormat.actualImageFormat();
bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVKDepthStencilImageUsageFlags
: kSurfaceVKColorImageUsageFlags;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVkDepthStencilImageUsageFlags
: kSurfaceVkColorImageUsageFlags;
VkExtent3D extents = {std::max(static_cast<uint32_t>(width), 1u),
std::max(static_cast<uint32_t>(height), 1u), 1u};
......@@ -195,8 +195,8 @@ angle::Result OffscreenSurfaceVk::AttachmentImage::initializeWithExternalMemory(
const angle::Format &textureFormat = vkFormat.actualImageFormat();
bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVKDepthStencilImageUsageFlags
: kSurfaceVKColorImageUsageFlags;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVkDepthStencilImageUsageFlags
: kSurfaceVkColorImageUsageFlags;
VkExtent3D extents = {std::max(static_cast<uint32_t>(width), 1u),
std::max(static_cast<uint32_t>(height), 1u), 1u};
......@@ -575,8 +575,8 @@ angle::Result WindowSurfaceVk::initializeImpl(DisplayVk *displayVk)
// TODO(jmadill): Support devices which don't support copy. We use this for ReadPixels.
ANGLE_VK_CHECK(displayVk,
(mSurfaceCaps.supportedUsageFlags & kSurfaceVKColorImageUsageFlags) ==
kSurfaceVKColorImageUsageFlags,
(mSurfaceCaps.supportedUsageFlags & kSurfaceVkColorImageUsageFlags) ==
kSurfaceVkColorImageUsageFlags,
VK_ERROR_INITIALIZATION_FAILED);
EGLAttrib attribWidth = mState.attributes.get(EGL_WIDTH, 0);
......@@ -880,7 +880,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
}
// We need transfer src for reading back from the backbuffer.
VkImageUsageFlags imageUsageFlags = kSurfaceVKColorImageUsageFlags;
VkImageUsageFlags imageUsageFlags = kSurfaceVkColorImageUsageFlags;
#if ANGLE_ENABLE_OVERLAY
// We need storage image for compute writes (debug overlay output).
......@@ -939,7 +939,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
if (samples > 1)
{
const VkImageUsageFlags usage = kSurfaceVKColorImageUsageFlags;
const VkImageUsageFlags usage = kSurfaceVkColorImageUsageFlags;
ANGLE_TRY(mColorImageMS.init(context, gl::TextureType::_2D, vkExtents, format, samples,
usage, gl::LevelIndex(0), gl::LevelIndex(0), 1, 1));
......@@ -966,7 +966,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
{
const vk::Format &dsFormat = renderer->getFormat(mState.config->depthStencilFormat);
const VkImageUsageFlags dsUsage = kSurfaceVKDepthStencilImageUsageFlags;
const VkImageUsageFlags dsUsage = kSurfaceVkDepthStencilImageUsageFlags;
ANGLE_TRY(mDepthStencilImage.init(context, gl::TextureType::_2D, vkExtents, dsFormat,
samples, dsUsage, gl::LevelIndex(0), gl::LevelIndex(0), 1,
......
src/libANGLE/renderer/vulkan/UtilsVk.cpp
......@@ -1670,7 +1670,7 @@ angle::Result UtilsVk::stencilBlitResolveNoShaderExport(ContextVk *contextVk,
region.bufferImageHeight = params.blitArea.height;
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
region.imageSubresource.mipLevel =
depthStencilImage->toVKLevel(gl::LevelIndex(depthStencilRenderTarget->getLevelIndex()))
depthStencilImage->toVkLevel(gl::LevelIndex(depthStencilRenderTarget->getLevelIndex()))
.get();
region.imageSubresource.baseArrayLayer = depthStencilRenderTarget->getLayerIndex();
region.imageSubresource.layerCount = 1;
......
src/libANGLE/renderer/vulkan/vk_helpers.h
......@@ -1247,7 +1247,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut,
LevelIndex baseMipLevelVK,
LevelIndex baseMipLevelVk,
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount) const;
......@@ -1256,7 +1256,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut,
LevelIndex baseMipLevelVK,
LevelIndex baseMipLevelVk,
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount,
......@@ -1267,7 +1267,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut,
LevelIndex baseMipLevelVK,
LevelIndex baseMipLevelVk,
uint32_t levelCount);
// Create a 2D[Array] for staging purposes. Used by:
//
......@@ -1322,10 +1322,10 @@ class ImageHelper final : public Resource, public angle::Subject
ImageLayout getCurrentImageLayout() const { return mCurrentLayout; }
VkImageLayout getCurrentLayout() const;
gl::Extents getLevelExtents(LevelIndex levelVK) const;
gl::Extents getLevelExtents(LevelIndex levelVk) const;
// Helper function to calculate the extents of a render target created for a certain mip of the
// image.
gl::Extents getLevelExtents2D(LevelIndex levelVK) const;
gl::Extents getLevelExtents2D(LevelIndex levelVk) const;
bool isDepthOrStencil() const;
// Clear either color or depth/stencil based on image format.
......@@ -1519,8 +1519,8 @@ class ImageHelper final : public Resource, public angle::Subject
gl::LevelIndex getBaseLevel() const { return mBaseLevel; }
void setBaseAndMaxLevels(gl::LevelIndex baseLevel, gl::LevelIndex maxLevel);
gl::LevelIndex getMaxLevel() const { return mMaxLevel; }
LevelIndex toVKLevel(gl::LevelIndex levelIndexGL) const;
gl::LevelIndex toGLLevel(LevelIndex levelIndexVK) const;
LevelIndex toVkLevel(gl::LevelIndex levelIndexGL) const;
gl::LevelIndex toGLLevel(LevelIndex levelIndexVk) const;
angle::Result copyImageDataToBuffer(ContextVk *contextVk,
gl::LevelIndex sourceLevelGL,
......@@ -1658,7 +1658,7 @@ class ImageHelper final : public Resource, public angle::Subject
void stageClearIfEmulatedFormat(Context *context);
void clearColor(const VkClearColorValue &color,
LevelIndex baseMipLevelVK,
LevelIndex baseMipLevelVk,
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount,
......@@ -1666,7 +1666,7 @@ class ImageHelper final : public Resource, public angle::Subject
void clearDepthStencil(VkImageAspectFlags clearAspectFlags,
const VkClearDepthStencilValue &depthStencil,
LevelIndex baseMipLevelVK,
LevelIndex baseMipLevelVk,
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount,
......@@ -1684,7 +1684,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut,
LevelIndex baseMipLevelVK,
LevelIndex baseMipLevelVk,
uint32_t levelCount,
uint32_t baseArrayLayer,
uint32_t layerCount,
......@@ -1861,7 +1861,7 @@ class ImageViewHelper : angle::NonCopyable
angle::Result getLevelDrawImageView(ContextVk *contextVk,
gl::TextureType viewType,
const ImageHelper &image,
LevelIndex levelVK,
LevelIndex levelVk,
uint32_t layer,
VkImageUsageFlags imageUsageFlags,
VkFormat vkImageFormat,
......@@ -1870,7 +1870,7 @@ class ImageViewHelper : angle::NonCopyable
// Creates a view with a single layer of the level.
angle::Result getLevelLayerDrawImageView(ContextVk *contextVk,
const ImageHelper &image,
LevelIndex levelVK,
LevelIndex levelVk,
uint32_t layer,
const ImageView **imageViewOut);
......
src/libANGLE/renderer/vulkan/vk_utils.cpp
......@@ -1341,9 +1341,9 @@ GLuint GetSampleCount(VkSampleCountFlags supportedCounts, GLuint requestedCount)
return 0;
}
gl::LevelIndex GetLevelIndex(vk::LevelIndex levelVK, gl::LevelIndex baseLevel)
gl::LevelIndex GetLevelIndex(vk::LevelIndex levelVk, gl::LevelIndex baseLevel)
{
return gl::LevelIndex(levelVK.get() + baseLevel.get());
return gl::LevelIndex(levelVk.get() + baseLevel.get());
}
} // namespace vk_gl
} // namespace rx
src/libANGLE/renderer/vulkan/vk_utils.h
......@@ -899,7 +899,7 @@ GLuint GetMaxSampleCount(VkSampleCountFlags sampleCounts);
// Return a supported sample count that's at least as large as the requested one.
GLuint GetSampleCount(VkSampleCountFlags supportedCounts, GLuint requestedCount);
gl::LevelIndex GetLevelIndex(vk::LevelIndex levelVK, gl::LevelIndex baseLevel);
gl::LevelIndex GetLevelIndex(vk::LevelIndex levelVk, gl::LevelIndex baseLevel);
} // namespace vk_gl
} // namespace rx
......
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