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 137 additions and 137 deletions
src/libANGLE/renderer/vulkan/FramebufferVk.cpp
...@@ -798,13 +798,13 @@ angle::Result FramebufferVk::blitWithCommand(ContextVk *contextVk, ...@@ -798,13 +798,13 @@ angle::Result FramebufferVk::blitWithCommand(ContextVk *contextVk,
VkImageBlit blit = {}; VkImageBlit blit = {};
blit.srcSubresource.aspectMask = blitAspectMask; 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.baseArrayLayer = readRenderTarget->getLayerIndex();
blit.srcSubresource.layerCount = 1; blit.srcSubresource.layerCount = 1;
blit.srcOffsets[0] = {sourceArea.x0(), sourceArea.y0(), 0}; blit.srcOffsets[0] = {sourceArea.x0(), sourceArea.y0(), 0};
blit.srcOffsets[1] = {sourceArea.x1(), sourceArea.y1(), 1}; blit.srcOffsets[1] = {sourceArea.x1(), sourceArea.y1(), 1};
blit.dstSubresource.aspectMask = blitAspectMask; 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.baseArrayLayer = drawRenderTarget->getLayerIndex();
blit.dstSubresource.layerCount = 1; blit.dstSubresource.layerCount = 1;
blit.dstOffsets[0] = {destArea.x0(), destArea.y0(), 0}; blit.dstOffsets[0] = {destArea.x0(), destArea.y0(), 0};
...@@ -1181,7 +1181,7 @@ angle::Result FramebufferVk::blit(const gl::Context *context, ...@@ -1181,7 +1181,7 @@ angle::Result FramebufferVk::blit(const gl::Context *context,
vk::ImageHelper *depthStencilImage = &readRenderTarget->getImageForCopy(); vk::ImageHelper *depthStencilImage = &readRenderTarget->getImageForCopy();
vk::LevelIndex levelIndex = vk::LevelIndex levelIndex =
depthStencilImage->toVKLevel(readRenderTarget->getLevelIndex()); depthStencilImage->toVkLevel(readRenderTarget->getLevelIndex());
uint32_t layerIndex = readRenderTarget->getLayerIndex(); uint32_t layerIndex = readRenderTarget->getLayerIndex();
gl::TextureType textureType = vk::Get2DTextureType(depthStencilImage->getLayerCount(), gl::TextureType textureType = vk::Get2DTextureType(depthStencilImage->getLayerCount(),
depthStencilImage->getSamples()); depthStencilImage->getSamples());
...@@ -1337,8 +1337,8 @@ angle::Result FramebufferVk::resolveColorWithCommand(ContextVk *contextVk, ...@@ -1337,8 +1337,8 @@ angle::Result FramebufferVk::resolveColorWithCommand(ContextVk *contextVk,
vk::CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer(); vk::CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer();
vk::ImageHelper &dstImage = drawRenderTarget->getImageForWrite(); vk::ImageHelper &dstImage = drawRenderTarget->getImageForWrite();
vk::LevelIndex levelVK = dstImage.toVKLevel(drawRenderTarget->getLevelIndex()); vk::LevelIndex levelVk = dstImage.toVkLevel(drawRenderTarget->getLevelIndex());
resolveRegion.dstSubresource.mipLevel = levelVK.get(); resolveRegion.dstSubresource.mipLevel = levelVk.get();
resolveRegion.dstSubresource.baseArrayLayer = drawRenderTarget->getLayerIndex(); resolveRegion.dstSubresource.baseArrayLayer = drawRenderTarget->getLayerIndex();
srcImage->resolve(&dstImage, resolveRegion, &commandBuffer); srcImage->resolve(&dstImage, resolveRegion, &commandBuffer);
...@@ -1367,7 +1367,7 @@ angle::Result FramebufferVk::copyResolveToMultisampedAttachment(ContextVk *conte ...@@ -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. // There's no choice but to use a draw-based path to perform this copy.
gl::Extents extents = colorRenderTarget->getExtents(); gl::Extents extents = colorRenderTarget->getExtents();
vk::LevelIndex levelVK = src->toVKLevel(colorRenderTarget->getLevelIndex()); vk::LevelIndex levelVk = src->toVkLevel(colorRenderTarget->getLevelIndex());
uint32_t layer = colorRenderTarget->getLayerIndex(); uint32_t layer = colorRenderTarget->getLayerIndex();
UtilsVk::CopyImageParameters params; UtilsVk::CopyImageParameters params;
...@@ -1377,7 +1377,7 @@ angle::Result FramebufferVk::copyResolveToMultisampedAttachment(ContextVk *conte ...@@ -1377,7 +1377,7 @@ angle::Result FramebufferVk::copyResolveToMultisampedAttachment(ContextVk *conte
params.srcExtents[1] = extents.height; params.srcExtents[1] = extents.height;
params.destOffset[0] = 0; params.destOffset[0] = 0;
params.destOffset[1] = 0; params.destOffset[1] = 0;
params.srcMip = levelVK.get(); params.srcMip = levelVk.get();
params.srcLayer = layer; params.srcLayer = layer;
params.srcHeight = extents.height; params.srcHeight = extents.height;
params.srcPremultiplyAlpha = false; params.srcPremultiplyAlpha = false;
......
src/libANGLE/renderer/vulkan/FramebufferVk.h
...@@ -29,7 +29,7 @@ class FramebufferVk : public FramebufferImpl ...@@ -29,7 +29,7 @@ class FramebufferVk : public FramebufferImpl
// Factory methods so we don't have to use constructors with overloads. // Factory methods so we don't have to use constructors with overloads.
static FramebufferVk *CreateUserFBO(RendererVk *renderer, const gl::FramebufferState &state); 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 // ref-counted on the number of 'current' contexts, so we shouldn't get any dangling surface
// references. See Surface::setIsCurrent(bool). // references. See Surface::setIsCurrent(bool).
static FramebufferVk *CreateDefaultFBO(RendererVk *renderer, static FramebufferVk *CreateDefaultFBO(RendererVk *renderer,
......
src/libANGLE/renderer/vulkan/RenderTargetVk.cpp
...@@ -165,8 +165,8 @@ angle::Result RenderTargetVk::getImageViewImpl(ContextVk *contextVk, ...@@ -165,8 +165,8 @@ angle::Result RenderTargetVk::getImageViewImpl(ContextVk *contextVk,
const vk::ImageView **imageViewOut) const const vk::ImageView **imageViewOut) const
{ {
ASSERT(image.valid() && imageViews); ASSERT(image.valid() && imageViews);
vk::LevelIndex levelVK = mImage->toVKLevel(mLevelIndexGL); vk::LevelIndex levelVk = mImage->toVkLevel(mLevelIndexGL);
return imageViews->getLevelLayerDrawImageView(contextVk, image, levelVK, mLayerIndex, return imageViews->getLevelLayerDrawImageView(contextVk, image, levelVk, mLayerIndex,
imageViewOut); imageViewOut);
} }
...@@ -224,8 +224,8 @@ const vk::Format &RenderTargetVk::getImageFormat() const ...@@ -224,8 +224,8 @@ const vk::Format &RenderTargetVk::getImageFormat() const
gl::Extents RenderTargetVk::getExtents() const gl::Extents RenderTargetVk::getExtents() const
{ {
ASSERT(mImage && mImage->valid()); ASSERT(mImage && mImage->valid());
vk::LevelIndex levelVK = mImage->toVKLevel(mLevelIndexGL); vk::LevelIndex levelVk = mImage->toVkLevel(mLevelIndexGL);
return mImage->getLevelExtents2D(levelVK); return mImage->getLevelExtents2D(levelVk);
} }
void RenderTargetVk::updateSwapchainImage(vk::ImageHelper *image, void RenderTargetVk::updateSwapchainImage(vk::ImageHelper *image,
......
src/libANGLE/renderer/vulkan/SurfaceVk.cpp
...@@ -94,12 +94,12 @@ VkPresentModeKHR GetDesiredPresentMode(const std::vector<VkPresentModeKHR> &pres ...@@ -94,12 +94,12 @@ VkPresentModeKHR GetDesiredPresentMode(const std::vector<VkPresentModeKHR> &pres
return VK_PRESENT_MODE_FIFO_KHR; 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; VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT | VK_IMAGE_USAGE_SAMPLED_BIT;
constexpr VkImageUsageFlags kSurfaceVKColorImageUsageFlags = constexpr VkImageUsageFlags kSurfaceVkColorImageUsageFlags =
kSurfaceVKImageUsageFlags | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; kSurfaceVkImageUsageFlags | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT;
constexpr VkImageUsageFlags kSurfaceVKDepthStencilImageUsageFlags = constexpr VkImageUsageFlags kSurfaceVkDepthStencilImageUsageFlags =
kSurfaceVKImageUsageFlags | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; kSurfaceVkImageUsageFlags | VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT;
// If the device is rotated with any of the following transform flags, the swapchain width and // 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 // 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 ...@@ -165,8 +165,8 @@ angle::Result OffscreenSurfaceVk::AttachmentImage::initialize(DisplayVk *display
const angle::Format &textureFormat = vkFormat.actualImageFormat(); const angle::Format &textureFormat = vkFormat.actualImageFormat();
bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0; bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVKDepthStencilImageUsageFlags const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVkDepthStencilImageUsageFlags
: kSurfaceVKColorImageUsageFlags; : kSurfaceVkColorImageUsageFlags;
VkExtent3D extents = {std::max(static_cast<uint32_t>(width), 1u), VkExtent3D extents = {std::max(static_cast<uint32_t>(width), 1u),
std::max(static_cast<uint32_t>(height), 1u), 1u}; std::max(static_cast<uint32_t>(height), 1u), 1u};
...@@ -195,8 +195,8 @@ angle::Result OffscreenSurfaceVk::AttachmentImage::initializeWithExternalMemory( ...@@ -195,8 +195,8 @@ angle::Result OffscreenSurfaceVk::AttachmentImage::initializeWithExternalMemory(
const angle::Format &textureFormat = vkFormat.actualImageFormat(); const angle::Format &textureFormat = vkFormat.actualImageFormat();
bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0; bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVKDepthStencilImageUsageFlags const VkImageUsageFlags usage = isDepthOrStencilFormat ? kSurfaceVkDepthStencilImageUsageFlags
: kSurfaceVKColorImageUsageFlags; : kSurfaceVkColorImageUsageFlags;
VkExtent3D extents = {std::max(static_cast<uint32_t>(width), 1u), VkExtent3D extents = {std::max(static_cast<uint32_t>(width), 1u),
std::max(static_cast<uint32_t>(height), 1u), 1u}; std::max(static_cast<uint32_t>(height), 1u), 1u};
...@@ -575,8 +575,8 @@ angle::Result WindowSurfaceVk::initializeImpl(DisplayVk *displayVk) ...@@ -575,8 +575,8 @@ angle::Result WindowSurfaceVk::initializeImpl(DisplayVk *displayVk)
// TODO(jmadill): Support devices which don't support copy. We use this for ReadPixels. // TODO(jmadill): Support devices which don't support copy. We use this for ReadPixels.
ANGLE_VK_CHECK(displayVk, ANGLE_VK_CHECK(displayVk,
(mSurfaceCaps.supportedUsageFlags & kSurfaceVKColorImageUsageFlags) == (mSurfaceCaps.supportedUsageFlags & kSurfaceVkColorImageUsageFlags) ==
kSurfaceVKColorImageUsageFlags, kSurfaceVkColorImageUsageFlags,
VK_ERROR_INITIALIZATION_FAILED); VK_ERROR_INITIALIZATION_FAILED);
EGLAttrib attribWidth = mState.attributes.get(EGL_WIDTH, 0); EGLAttrib attribWidth = mState.attributes.get(EGL_WIDTH, 0);
...@@ -880,7 +880,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context, ...@@ -880,7 +880,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
} }
// We need transfer src for reading back from the backbuffer. // We need transfer src for reading back from the backbuffer.
VkImageUsageFlags imageUsageFlags = kSurfaceVKColorImageUsageFlags; VkImageUsageFlags imageUsageFlags = kSurfaceVkColorImageUsageFlags;
#if ANGLE_ENABLE_OVERLAY #if ANGLE_ENABLE_OVERLAY
// We need storage image for compute writes (debug overlay output). // We need storage image for compute writes (debug overlay output).
...@@ -939,7 +939,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context, ...@@ -939,7 +939,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
if (samples > 1) if (samples > 1)
{ {
const VkImageUsageFlags usage = kSurfaceVKColorImageUsageFlags; const VkImageUsageFlags usage = kSurfaceVkColorImageUsageFlags;
ANGLE_TRY(mColorImageMS.init(context, gl::TextureType::_2D, vkExtents, format, samples, ANGLE_TRY(mColorImageMS.init(context, gl::TextureType::_2D, vkExtents, format, samples,
usage, gl::LevelIndex(0), gl::LevelIndex(0), 1, 1)); usage, gl::LevelIndex(0), gl::LevelIndex(0), 1, 1));
...@@ -966,7 +966,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context, ...@@ -966,7 +966,7 @@ angle::Result WindowSurfaceVk::createSwapChain(vk::Context *context,
{ {
const vk::Format &dsFormat = renderer->getFormat(mState.config->depthStencilFormat); 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, ANGLE_TRY(mDepthStencilImage.init(context, gl::TextureType::_2D, vkExtents, dsFormat,
samples, dsUsage, gl::LevelIndex(0), gl::LevelIndex(0), 1, samples, dsUsage, gl::LevelIndex(0), gl::LevelIndex(0), 1,
......
src/libANGLE/renderer/vulkan/TextureVk.cpp
...@@ -54,8 +54,8 @@ bool IsTextureLevelInAllocatedImage(const vk::ImageHelper &image, ...@@ -54,8 +54,8 @@ bool IsTextureLevelInAllocatedImage(const vk::ImageHelper &image,
return false; return false;
} }
vk::LevelIndex imageLevelIndexVK = image.toVKLevel(textureLevelIndexGL); vk::LevelIndex imageLevelIndexVk = image.toVkLevel(textureLevelIndexGL);
return imageLevelIndexVK < vk::LevelIndex(image.getLevelCount()); return imageLevelIndexVk < vk::LevelIndex(image.getLevelCount());
} }
// Test whether a redefined texture level is compatible with the currently allocated image. Returns // Test whether a redefined texture level is compatible with the currently allocated image. Returns
...@@ -74,8 +74,8 @@ bool IsTextureLevelDefinitionCompatibleWithImage(const vk::ImageHelper &image, ...@@ -74,8 +74,8 @@ bool IsTextureLevelDefinitionCompatibleWithImage(const vk::ImageHelper &image,
{ {
ASSERT(IsTextureLevelInAllocatedImage(image, textureLevelIndexGL)); ASSERT(IsTextureLevelInAllocatedImage(image, textureLevelIndexGL));
vk::LevelIndex imageLevelIndexVK = image.toVKLevel(textureLevelIndexGL); vk::LevelIndex imageLevelIndexVk = image.toVkLevel(textureLevelIndexGL);
return size == image.getLevelExtents(imageLevelIndexVK) && format == image.getFormat(); return size == image.getLevelExtents(imageLevelIndexVk) && format == image.getFormat();
} }
ANGLE_INLINE bool FormatHasNecessaryFeature(RendererVk *renderer, ANGLE_INLINE bool FormatHasNecessaryFeature(RendererVk *renderer,
...@@ -348,14 +348,14 @@ bool TextureVk::shouldUpdateBeStaged(gl::LevelIndex textureLevelIndexGL) const ...@@ -348,14 +348,14 @@ bool TextureVk::shouldUpdateBeStaged(gl::LevelIndex textureLevelIndexGL) const
return true; return true;
} }
vk::LevelIndex imageLevelIndexVK = mImage->toVKLevel(textureLevelIndexGL); vk::LevelIndex imageLevelIndexVk = mImage->toVkLevel(textureLevelIndexGL);
// Can't have more than 32 mips for the foreseeable future. // Can't have more than 32 mips for the foreseeable future.
ASSERT(imageLevelIndexVK < vk::LevelIndex(32)); ASSERT(imageLevelIndexVk < vk::LevelIndex(32));
// Otherwise, it can only be directly applied to the image if the level is not previously // Otherwise, it can only be directly applied to the image if the level is not previously
// incompatibly redefined. // incompatibly redefined.
return mRedefinedLevels.test(imageLevelIndexVK.get()); return mRedefinedLevels.test(imageLevelIndexVk.get());
} }
angle::Result TextureVk::setSubImageImpl(const gl::Context *context, angle::Result TextureVk::setSubImageImpl(const gl::Context *context,
...@@ -808,7 +808,7 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk, ...@@ -808,7 +808,7 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk,
VkImageSubresourceLayers srcSubresource = {}; VkImageSubresourceLayers srcSubresource = {};
srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
srcSubresource.mipLevel = srcImage->toVKLevel(sourceLevelGL).get(); srcSubresource.mipLevel = srcImage->toVkLevel(sourceLevelGL).get();
srcSubresource.baseArrayLayer = static_cast<uint32_t>(sourceLayer); srcSubresource.baseArrayLayer = static_cast<uint32_t>(sourceLayer);
srcSubresource.layerCount = layerCount; srcSubresource.layerCount = layerCount;
...@@ -846,7 +846,7 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk, ...@@ -846,7 +846,7 @@ angle::Result TextureVk::copySubImageImplWithTransfer(ContextVk *contextVk,
vk::CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer(); vk::CommandBuffer &commandBuffer = contextVk->getOutsideRenderPassCommandBuffer();
VkImageSubresourceLayers destSubresource = srcSubresource; VkImageSubresourceLayers destSubresource = srcSubresource;
destSubresource.mipLevel = mImage->toVKLevel(level).get(); destSubresource.mipLevel = mImage->toVkLevel(level).get();
destSubresource.baseArrayLayer = baseLayer; destSubresource.baseArrayLayer = baseLayer;
destSubresource.layerCount = layerCount; destSubresource.layerCount = layerCount;
...@@ -968,7 +968,7 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk, ...@@ -968,7 +968,7 @@ angle::Result TextureVk::copySubImageImplWithDraw(ContextVk *contextVk,
params.srcExtents[1] = rotatedSourceBox.height; params.srcExtents[1] = rotatedSourceBox.height;
params.destOffset[0] = destOffset.x; params.destOffset[0] = destOffset.x;
params.destOffset[1] = destOffset.y; params.destOffset[1] = destOffset.y;
params.srcMip = srcImage->toVKLevel(sourceLevelGL).get(); params.srcMip = srcImage->toVkLevel(sourceLevelGL).get();
params.srcHeight = srcExtents.height; params.srcHeight = srcExtents.height;
params.srcPremultiplyAlpha = unpackPremultiplyAlpha && !unpackUnmultiplyAlpha; params.srcPremultiplyAlpha = unpackPremultiplyAlpha && !unpackUnmultiplyAlpha;
params.srcUnmultiplyAlpha = unpackUnmultiplyAlpha && !unpackPremultiplyAlpha; params.srcUnmultiplyAlpha = unpackUnmultiplyAlpha && !unpackPremultiplyAlpha;
...@@ -1362,8 +1362,8 @@ angle::Result TextureVk::redefineLevel(const gl::Context *context, ...@@ -1362,8 +1362,8 @@ angle::Result TextureVk::redefineLevel(const gl::Context *context,
// corresponding bit should clear. // corresponding bit should clear.
if (isInAllocatedImage) if (isInAllocatedImage)
{ {
vk::LevelIndex levelIndexVK = mImage->toVKLevel(levelIndexGL); vk::LevelIndex levelIndexVk = mImage->toVkLevel(levelIndexGL);
mRedefinedLevels.set(levelIndexVK.get(), !isCompatibleRedefinition); mRedefinedLevels.set(levelIndexVk.get(), !isCompatibleRedefinition);
} }
bool isUpdateToSingleLevelImage = bool isUpdateToSingleLevelImage =
...@@ -1466,7 +1466,7 @@ angle::Result TextureVk::copyBufferDataToImage(ContextVk *contextVk, ...@@ -1466,7 +1466,7 @@ angle::Result TextureVk::copyBufferDataToImage(ContextVk *contextVk,
region.imageSubresource.baseArrayLayer = layerIndex; region.imageSubresource.baseArrayLayer = layerIndex;
region.imageSubresource.layerCount = 1; region.imageSubresource.layerCount = 1;
region.imageSubresource.mipLevel = region.imageSubresource.mipLevel =
mImage->toVKLevel(gl::LevelIndex(index.getLevelIndex())).get(); mImage->toVkLevel(gl::LevelIndex(index.getLevelIndex())).get();
if (index.getType() == gl::TextureType::_2DArray) if (index.getType() == gl::TextureType::_2DArray)
{ {
...@@ -1518,9 +1518,9 @@ angle::Result TextureVk::generateMipmapsWithCompute(ContextVk *contextVk) ...@@ -1518,9 +1518,9 @@ angle::Result TextureVk::generateMipmapsWithCompute(ContextVk *contextVk)
// If the image has more levels than supported, generate as many mips as possible at a time. // If the image has more levels than supported, generate as many mips as possible at a time.
const vk::LevelIndex maxGenerateLevels(UtilsVk::GetGenerateMipmapMaxLevels(contextVk)); const vk::LevelIndex maxGenerateLevels(UtilsVk::GetGenerateMipmapMaxLevels(contextVk));
for (vk::LevelIndex destBaseLevelVK(1); for (vk::LevelIndex destBaseLevelVk(1);
destBaseLevelVK < vk::LevelIndex(mImage->getLevelCount()); destBaseLevelVk < vk::LevelIndex(mImage->getLevelCount());
destBaseLevelVK = destBaseLevelVK + maxGenerateLevels.get()) destBaseLevelVk = destBaseLevelVk + maxGenerateLevels.get())
{ {
ANGLE_TRY(contextVk->onImageComputeShaderWrite(VK_IMAGE_ASPECT_COLOR_BIT, mImage)); ANGLE_TRY(contextVk->onImageComputeShaderWrite(VK_IMAGE_ASPECT_COLOR_BIT, mImage));
...@@ -1531,37 +1531,37 @@ angle::Result TextureVk::generateMipmapsWithCompute(ContextVk *contextVk) ...@@ -1531,37 +1531,37 @@ angle::Result TextureVk::generateMipmapsWithCompute(ContextVk *contextVk)
const vk::ImageView *srcView = nullptr; const vk::ImageView *srcView = nullptr;
UtilsVk::GenerateMipmapDestLevelViews destLevelViews = {}; UtilsVk::GenerateMipmapDestLevelViews destLevelViews = {};
const vk::LevelIndex srcLevelVK = destBaseLevelVK - 1; const vk::LevelIndex srcLevelVk = destBaseLevelVk - 1;
ANGLE_TRY(getImageViews().getLevelLayerDrawImageView(contextVk, *mImage, srcLevelVK, ANGLE_TRY(getImageViews().getLevelLayerDrawImageView(contextVk, *mImage, srcLevelVk,
layer, &srcView)); layer, &srcView));
vk::LevelIndex destLevelCount = maxGenerateLevels; vk::LevelIndex destLevelCount = maxGenerateLevels;
for (vk::LevelIndex levelVK(0); levelVK < maxGenerateLevels; ++levelVK) for (vk::LevelIndex levelVk(0); levelVk < maxGenerateLevels; ++levelVk)
{ {
vk::LevelIndex destLevelVK = destBaseLevelVK + levelVK.get(); vk::LevelIndex destLevelVk = destBaseLevelVk + levelVk.get();
// If fewer levels left than maxGenerateLevels, cut the loop short. // If fewer levels left than maxGenerateLevels, cut the loop short.
if (destLevelVK >= vk::LevelIndex(mImage->getLevelCount())) if (destLevelVk >= vk::LevelIndex(mImage->getLevelCount()))
{ {
destLevelCount = levelVK; destLevelCount = levelVk;
break; break;
} }
ANGLE_TRY(getImageViews().getLevelLayerDrawImageView( ANGLE_TRY(getImageViews().getLevelLayerDrawImageView(
contextVk, *mImage, destLevelVK, layer, &destLevelViews[levelVK.get()])); contextVk, *mImage, destLevelVk, layer, &destLevelViews[levelVk.get()]));
} }
// If the image has fewer than maximum levels, fill the last views with a dummy view. // If the image has fewer than maximum levels, fill the last views with a dummy view.
ASSERT(destLevelCount > vk::LevelIndex(0)); ASSERT(destLevelCount > vk::LevelIndex(0));
for (vk::LevelIndex levelVK = destLevelCount; for (vk::LevelIndex levelVk = destLevelCount;
levelVK < vk::LevelIndex(UtilsVk::kGenerateMipmapMaxLevels); ++levelVK) levelVk < vk::LevelIndex(UtilsVk::kGenerateMipmapMaxLevels); ++levelVk)
{ {
destLevelViews[levelVK.get()] = destLevelViews[levelVK.get() - 1]; destLevelViews[levelVk.get()] = destLevelViews[levelVk.get() - 1];
} }
// Generate mipmaps. // Generate mipmaps.
UtilsVk::GenerateMipmapParameters params = {}; UtilsVk::GenerateMipmapParameters params = {};
params.srcLevel = srcLevelVK.get(); params.srcLevel = srcLevelVk.get();
params.destLevelCount = destLevelCount.get(); params.destLevelCount = destLevelCount.get();
ANGLE_TRY(contextVk->getUtils().generateMipmap( ANGLE_TRY(contextVk->getUtils().generateMipmap(
...@@ -1801,13 +1801,13 @@ angle::Result TextureVk::respecifyImageAttributesAndLevels(ContextVk *contextVk, ...@@ -1801,13 +1801,13 @@ angle::Result TextureVk::respecifyImageAttributesAndLevels(ContextVk *contextVk,
// The staged updates won't be applied until the image has the requisite mip levels // The staged updates won't be applied until the image has the requisite mip levels
for (uint32_t layer = 0; layer < mImage->getLayerCount(); layer++) for (uint32_t layer = 0; layer < mImage->getLayerCount(); layer++)
{ {
for (vk::LevelIndex levelVK(0); levelVK < vk::LevelIndex(mImage->getLevelCount()); for (vk::LevelIndex levelVk(0); levelVk < vk::LevelIndex(mImage->getLevelCount());
++levelVK) ++levelVk)
{ {
// Vulkan level 0 previously aligned with whatever the base level was. // Vulkan level 0 previously aligned with whatever the base level was.
gl::LevelIndex levelGL = vk_gl::GetLevelIndex(levelVK, previousBaseLevel); gl::LevelIndex levelGL = vk_gl::GetLevelIndex(levelVk, previousBaseLevel);
if (mRedefinedLevels.test(levelVK.get())) if (mRedefinedLevels.test(levelVk.get()))
{ {
// Note: if this level is incompatibly redefined, there will necessarily be a staged // Note: if this level is incompatibly redefined, there will necessarily be a staged
// update, and the contents of the image are to be thrown away. // update, and the contents of the image are to be thrown away.
...@@ -1820,7 +1820,7 @@ angle::Result TextureVk::respecifyImageAttributesAndLevels(ContextVk *contextVk, ...@@ -1820,7 +1820,7 @@ angle::Result TextureVk::respecifyImageAttributesAndLevels(ContextVk *contextVk,
// Pull data from the current image and stage it as an update for the new image // Pull data from the current image and stage it as an update for the new image
// First we populate the staging buffer with current level data // First we populate the staging buffer with current level data
ANGLE_TRY(copyAndStageImageSubresource(contextVk, true, layer, levelVK, levelGL)); ANGLE_TRY(copyAndStageImageSubresource(contextVk, true, layer, levelVk, levelGL));
} }
} }
...@@ -1991,10 +1991,10 @@ angle::Result TextureVk::flushImageStagedUpdates(ContextVk *contextVk) ...@@ -1991,10 +1991,10 @@ angle::Result TextureVk::flushImageStagedUpdates(ContextVk *contextVk)
ASSERT(mImage->valid()); ASSERT(mImage->valid());
gl::LevelIndex baseLevelGL = getNativeImageLevel(mImage->getBaseLevel()); gl::LevelIndex baseLevelGL = getNativeImageLevel(mImage->getBaseLevel());
vk::LevelIndex baseLevelVK = mImage->toVKLevel(baseLevelGL); vk::LevelIndex baseLevelVk = mImage->toVkLevel(baseLevelGL);
return mImage->flushStagedUpdates( return mImage->flushStagedUpdates(
contextVk, baseLevelVK, vk::LevelIndex(mImage->getLevelCount()), getNativeImageLayer(0), contextVk, baseLevelVk, vk::LevelIndex(mImage->getLevelCount()), getNativeImageLayer(0),
mImage->getLayerCount(), mRedefinedLevels); mImage->getLayerCount(), mRedefinedLevels);
} }
...@@ -2324,10 +2324,10 @@ angle::Result TextureVk::getLevelLayerImageView(ContextVk *contextVk, ...@@ -2324,10 +2324,10 @@ angle::Result TextureVk::getLevelLayerImageView(ContextVk *contextVk,
ASSERT(mImage && mImage->valid()); ASSERT(mImage && mImage->valid());
gl::LevelIndex levelGL = getNativeImageLevel(level); gl::LevelIndex levelGL = getNativeImageLevel(level);
vk::LevelIndex levelVK = mImage->toVKLevel(levelGL); vk::LevelIndex levelVk = mImage->toVkLevel(levelGL);
uint32_t nativeLayer = getNativeImageLayer(static_cast<uint32_t>(layer)); uint32_t nativeLayer = getNativeImageLayer(static_cast<uint32_t>(layer));
return getImageViews().getLevelLayerDrawImageView(contextVk, *mImage, levelVK, nativeLayer, return getImageViews().getLevelLayerDrawImageView(contextVk, *mImage, levelVk, nativeLayer,
imageViewOut); imageViewOut);
} }
...@@ -2346,11 +2346,11 @@ angle::Result TextureVk::getStorageImageView(ContextVk *contextVk, ...@@ -2346,11 +2346,11 @@ angle::Result TextureVk::getStorageImageView(ContextVk *contextVk,
gl::LevelIndex nativeLevelGL = gl::LevelIndex nativeLevelGL =
getNativeImageLevel(gl::LevelIndex(static_cast<uint32_t>(binding.level))); getNativeImageLevel(gl::LevelIndex(static_cast<uint32_t>(binding.level)));
vk::LevelIndex nativeLevelVK = mImage->toVKLevel(nativeLevelGL); vk::LevelIndex nativeLevelVk = mImage->toVkLevel(nativeLevelGL);
uint32_t nativeLayer = getNativeImageLayer(0); uint32_t nativeLayer = getNativeImageLayer(0);
return getImageViews().getLevelDrawImageView( return getImageViews().getLevelDrawImageView(
contextVk, mState.getType(), *mImage, nativeLevelVK, nativeLayer, contextVk, mState.getType(), *mImage, nativeLevelVk, nativeLayer,
VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT, format.vkImageFormat, VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT, format.vkImageFormat,
imageViewOut); imageViewOut);
} }
...@@ -2391,14 +2391,14 @@ angle::Result TextureVk::initImageViews(ContextVk *contextVk, ...@@ -2391,14 +2391,14 @@ angle::Result TextureVk::initImageViews(ContextVk *contextVk,
ASSERT(mImage != nullptr && mImage->valid()); ASSERT(mImage != nullptr && mImage->valid());
gl::LevelIndex baseLevelGL = getNativeImageLevel(mImage->getBaseLevel()); gl::LevelIndex baseLevelGL = getNativeImageLevel(mImage->getBaseLevel());
vk::LevelIndex baseLevelVK = mImage->toVKLevel(baseLevelGL); vk::LevelIndex baseLevelVk = mImage->toVkLevel(baseLevelGL);
uint32_t baseLayer = getNativeImageLayer(0); uint32_t baseLayer = getNativeImageLayer(0);
gl::SwizzleState formatSwizzle = GetFormatSwizzle(contextVk, format, sized); gl::SwizzleState formatSwizzle = GetFormatSwizzle(contextVk, format, sized);
gl::SwizzleState readSwizzle = ApplySwizzle(formatSwizzle, mState.getSwizzleState()); gl::SwizzleState readSwizzle = ApplySwizzle(formatSwizzle, mState.getSwizzleState());
ANGLE_TRY(getImageViews().initReadViews(contextVk, mState.getType(), *mImage, format, ANGLE_TRY(getImageViews().initReadViews(contextVk, mState.getType(), *mImage, format,
formatSwizzle, readSwizzle, baseLevelVK, levelCount, formatSwizzle, readSwizzle, baseLevelVk, levelCount,
baseLayer, layerCount, mRequiresSRGBViews, baseLayer, layerCount, mRequiresSRGBViews,
mImageUsageFlags & ~VK_IMAGE_USAGE_STORAGE_BIT)); mImageUsageFlags & ~VK_IMAGE_USAGE_STORAGE_BIT));
......
src/libANGLE/renderer/vulkan/UtilsVk.cpp
...@@ -1670,7 +1670,7 @@ angle::Result UtilsVk::stencilBlitResolveNoShaderExport(ContextVk *contextVk, ...@@ -1670,7 +1670,7 @@ angle::Result UtilsVk::stencilBlitResolveNoShaderExport(ContextVk *contextVk,
region.bufferImageHeight = params.blitArea.height; region.bufferImageHeight = params.blitArea.height;
region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT; region.imageSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT;
region.imageSubresource.mipLevel = region.imageSubresource.mipLevel =
depthStencilImage->toVKLevel(gl::LevelIndex(depthStencilRenderTarget->getLevelIndex())) depthStencilImage->toVkLevel(gl::LevelIndex(depthStencilRenderTarget->getLevelIndex()))
.get(); .get();
region.imageSubresource.baseArrayLayer = depthStencilRenderTarget->getLayerIndex(); region.imageSubresource.baseArrayLayer = depthStencilRenderTarget->getLayerIndex();
region.imageSubresource.layerCount = 1; region.imageSubresource.layerCount = 1;
......
src/libANGLE/renderer/vulkan/vk_helpers.cpp
...@@ -487,7 +487,7 @@ void DestroyImageViews(ImageViewVector *imageViewVector, VkDevice device) ...@@ -487,7 +487,7 @@ void DestroyImageViews(ImageViewVector *imageViewVector, VkDevice device)
imageViewVector->clear(); imageViewVector->clear();
} }
ImageView *GetLevelImageView(ImageViewVector *imageViews, LevelIndex levelVK, uint32_t levelCount) ImageView *GetLevelImageView(ImageViewVector *imageViews, LevelIndex levelVk, uint32_t levelCount)
{ {
// Lazily allocate the storage for image views. We allocate the full level count because we // Lazily allocate the storage for image views. We allocate the full level count because we
// don't want to trigger any std::vector reallocations. Reallocations could invalidate our // don't want to trigger any std::vector reallocations. Reallocations could invalidate our
...@@ -496,9 +496,9 @@ ImageView *GetLevelImageView(ImageViewVector *imageViews, LevelIndex levelVK, ui ...@@ -496,9 +496,9 @@ ImageView *GetLevelImageView(ImageViewVector *imageViews, LevelIndex levelVK, ui
{ {
imageViews->resize(levelCount); imageViews->resize(levelCount);
} }
ASSERT(imageViews->size() > levelVK.get()); ASSERT(imageViews->size() > levelVk.get());
return &(*imageViews)[levelVK.get()]; return &(*imageViews)[levelVk.get()];
} }
// Special rules apply to VkBufferImageCopy with depth/stencil. The components are tightly packed // Special rules apply to VkBufferImageCopy with depth/stencil. The components are tightly packed
...@@ -3172,11 +3172,11 @@ angle::Result ImageHelper::initImageView(Context *context, ...@@ -3172,11 +3172,11 @@ angle::Result ImageHelper::initImageView(Context *context,
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount) uint32_t levelCount)
{ {
return initLayerImageView(context, textureType, aspectMask, swizzleMap, imageViewOut, return initLayerImageView(context, textureType, aspectMask, swizzleMap, imageViewOut,
baseMipLevelVK, levelCount, 0, mLayerCount); baseMipLevelVk, levelCount, 0, mLayerCount);
} }
angle::Result ImageHelper::initLayerImageView(Context *context, angle::Result ImageHelper::initLayerImageView(Context *context,
...@@ -3184,13 +3184,13 @@ angle::Result ImageHelper::initLayerImageView(Context *context, ...@@ -3184,13 +3184,13 @@ angle::Result ImageHelper::initLayerImageView(Context *context,
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount) const uint32_t layerCount) const
{ {
return initLayerImageViewImpl(context, textureType, aspectMask, swizzleMap, imageViewOut, return initLayerImageViewImpl(context, textureType, aspectMask, swizzleMap, imageViewOut,
baseMipLevelVK, levelCount, baseArrayLayer, layerCount, baseMipLevelVk, levelCount, baseArrayLayer, layerCount,
mFormat->vkImageFormat, nullptr); mFormat->vkImageFormat, nullptr);
} }
...@@ -3200,7 +3200,7 @@ angle::Result ImageHelper::initLayerImageViewImpl( ...@@ -3200,7 +3200,7 @@ angle::Result ImageHelper::initLayerImageViewImpl(
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -3229,7 +3229,7 @@ angle::Result ImageHelper::initLayerImageViewImpl( ...@@ -3229,7 +3229,7 @@ angle::Result ImageHelper::initLayerImageViewImpl(
viewInfo.components.a = VK_COMPONENT_SWIZZLE_IDENTITY; viewInfo.components.a = VK_COMPONENT_SWIZZLE_IDENTITY;
} }
viewInfo.subresourceRange.aspectMask = aspectMask; viewInfo.subresourceRange.aspectMask = aspectMask;
viewInfo.subresourceRange.baseMipLevel = baseMipLevelVK.get(); viewInfo.subresourceRange.baseMipLevel = baseMipLevelVk.get();
viewInfo.subresourceRange.levelCount = levelCount; viewInfo.subresourceRange.levelCount = levelCount;
viewInfo.subresourceRange.baseArrayLayer = baseArrayLayer; viewInfo.subresourceRange.baseArrayLayer = baseArrayLayer;
viewInfo.subresourceRange.layerCount = layerCount; viewInfo.subresourceRange.layerCount = layerCount;
...@@ -3254,7 +3254,7 @@ angle::Result ImageHelper::initAliasedLayerImageView(Context *context, ...@@ -3254,7 +3254,7 @@ angle::Result ImageHelper::initAliasedLayerImageView(Context *context,
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -3267,7 +3267,7 @@ angle::Result ImageHelper::initAliasedLayerImageView(Context *context, ...@@ -3267,7 +3267,7 @@ angle::Result ImageHelper::initAliasedLayerImageView(Context *context,
imageUsageFlags & GetMaximalImageUsageFlags(context->getRenderer(), imageViewFormat); imageUsageFlags & GetMaximalImageUsageFlags(context->getRenderer(), imageViewFormat);
return initLayerImageViewImpl(context, textureType, aspectMask, swizzleMap, imageViewOut, return initLayerImageViewImpl(context, textureType, aspectMask, swizzleMap, imageViewOut,
baseMipLevelVK, levelCount, baseArrayLayer, layerCount, baseMipLevelVk, levelCount, baseArrayLayer, layerCount,
imageViewFormat, &imageViewUsageCreateInfo); imageViewFormat, &imageViewUsageCreateInfo);
} }
...@@ -3365,20 +3365,20 @@ VkImageLayout ImageHelper::getCurrentLayout() const ...@@ -3365,20 +3365,20 @@ VkImageLayout ImageHelper::getCurrentLayout() const
return ConvertImageLayoutToVkImageLayout(mCurrentLayout); return ConvertImageLayoutToVkImageLayout(mCurrentLayout);
} }
gl::Extents ImageHelper::getLevelExtents(LevelIndex levelVK) const gl::Extents ImageHelper::getLevelExtents(LevelIndex levelVk) const
{ {
// Level 0 should be the size of the extents, after that every time you increase a level // Level 0 should be the size of the extents, after that every time you increase a level
// you shrink the extents by half. // you shrink the extents by half.
uint32_t width = std::max(mExtents.width >> levelVK.get(), 1u); uint32_t width = std::max(mExtents.width >> levelVk.get(), 1u);
uint32_t height = std::max(mExtents.height >> levelVK.get(), 1u); uint32_t height = std::max(mExtents.height >> levelVk.get(), 1u);
uint32_t depth = std::max(mExtents.depth >> levelVK.get(), 1u); uint32_t depth = std::max(mExtents.depth >> levelVk.get(), 1u);
return gl::Extents(width, height, depth); return gl::Extents(width, height, depth);
} }
gl::Extents ImageHelper::getLevelExtents2D(LevelIndex levelVK) const gl::Extents ImageHelper::getLevelExtents2D(LevelIndex levelVk) const
{ {
gl::Extents extents = getLevelExtents(levelVK); gl::Extents extents = getLevelExtents(levelVk);
extents.depth = 1; extents.depth = 1;
return extents; return extents;
} }
...@@ -3459,14 +3459,14 @@ void ImageHelper::setBaseAndMaxLevels(gl::LevelIndex baseLevel, gl::LevelIndex m ...@@ -3459,14 +3459,14 @@ void ImageHelper::setBaseAndMaxLevels(gl::LevelIndex baseLevel, gl::LevelIndex m
mMaxLevel = maxLevel; mMaxLevel = maxLevel;
} }
LevelIndex ImageHelper::toVKLevel(gl::LevelIndex levelIndexGL) const LevelIndex ImageHelper::toVkLevel(gl::LevelIndex levelIndexGL) const
{ {
return gl_vk::GetLevelIndex(levelIndexGL, mBaseLevel); return gl_vk::GetLevelIndex(levelIndexGL, mBaseLevel);
} }
gl::LevelIndex ImageHelper::toGLLevel(LevelIndex levelIndexVK) const gl::LevelIndex ImageHelper::toGLLevel(LevelIndex levelIndexVk) const
{ {
return vk_gl::GetLevelIndex(levelIndexVK, mBaseLevel); return vk_gl::GetLevelIndex(levelIndexVk, mBaseLevel);
} }
ANGLE_INLINE void ImageHelper::initImageMemoryBarrierStruct( ANGLE_INLINE void ImageHelper::initImageMemoryBarrierStruct(
...@@ -3595,7 +3595,7 @@ bool ImageHelper::updateLayoutAndBarrier(VkImageAspectFlags aspectMask, ...@@ -3595,7 +3595,7 @@ bool ImageHelper::updateLayoutAndBarrier(VkImageAspectFlags aspectMask,
} }
void ImageHelper::clearColor(const VkClearColorValue &color, void ImageHelper::clearColor(const VkClearColorValue &color,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -3607,7 +3607,7 @@ void ImageHelper::clearColor(const VkClearColorValue &color, ...@@ -3607,7 +3607,7 @@ void ImageHelper::clearColor(const VkClearColorValue &color,
VkImageSubresourceRange range = {}; VkImageSubresourceRange range = {};
range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
range.baseMipLevel = baseMipLevelVK.get(); range.baseMipLevel = baseMipLevelVk.get();
range.levelCount = levelCount; range.levelCount = levelCount;
range.baseArrayLayer = baseArrayLayer; range.baseArrayLayer = baseArrayLayer;
range.layerCount = layerCount; range.layerCount = layerCount;
...@@ -3617,7 +3617,7 @@ void ImageHelper::clearColor(const VkClearColorValue &color, ...@@ -3617,7 +3617,7 @@ void ImageHelper::clearColor(const VkClearColorValue &color,
void ImageHelper::clearDepthStencil(VkImageAspectFlags clearAspectFlags, void ImageHelper::clearDepthStencil(VkImageAspectFlags clearAspectFlags,
const VkClearDepthStencilValue &depthStencil, const VkClearDepthStencilValue &depthStencil,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -3629,7 +3629,7 @@ void ImageHelper::clearDepthStencil(VkImageAspectFlags clearAspectFlags, ...@@ -3629,7 +3629,7 @@ void ImageHelper::clearDepthStencil(VkImageAspectFlags clearAspectFlags,
VkImageSubresourceRange clearRange = { VkImageSubresourceRange clearRange = {
/*aspectMask*/ clearAspectFlags, /*aspectMask*/ clearAspectFlags,
/*baseMipLevel*/ baseMipLevelVK.get(), /*baseMipLevel*/ baseMipLevelVk.get(),
/*levelCount*/ levelCount, /*levelCount*/ levelCount,
/*baseArrayLayer*/ baseArrayLayer, /*baseArrayLayer*/ baseArrayLayer,
/*layerCount*/ layerCount, /*layerCount*/ layerCount,
...@@ -4492,13 +4492,13 @@ angle::Result ImageHelper::flushSingleSubresourceStagedUpdates(ContextVk *contex ...@@ -4492,13 +4492,13 @@ angle::Result ImageHelper::flushSingleSubresourceStagedUpdates(ContextVk *contex
// Otherwise we proceed with a normal update. // Otherwise we proceed with a normal update.
} }
LevelIndex levelVK = toVKLevel(levelGL); LevelIndex levelVk = toVkLevel(levelGL);
return flushStagedUpdates(contextVk, levelVK, levelVK + 1, layer, layer + 1, {}); return flushStagedUpdates(contextVk, levelVk, levelVk + 1, layer, layer + 1, {});
} }
angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk, angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
LevelIndex levelVKStart, LevelIndex levelVkStart,
LevelIndex levelVKEnd, LevelIndex levelVkEnd,
uint32_t layerStart, uint32_t layerStart,
uint32_t layerEnd, uint32_t layerEnd,
gl::TexLevelMask skipLevelsMask) gl::TexLevelMask skipLevelsMask)
...@@ -4526,8 +4526,8 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk, ...@@ -4526,8 +4526,8 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
} }
} }
const gl::LevelIndex levelGLStart = toGLLevel(levelVKStart); const gl::LevelIndex levelGLStart = toGLLevel(levelVkStart);
const gl::LevelIndex levelGLEnd = toGLLevel(levelVKEnd); const gl::LevelIndex levelGLEnd = toGLLevel(levelVkEnd);
ANGLE_TRY(mStagingBuffer.flush(contextVk)); ANGLE_TRY(mStagingBuffer.flush(contextVk));
...@@ -4567,14 +4567,14 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk, ...@@ -4567,14 +4567,14 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
const bool areUpdateLayersOutsideRange = const bool areUpdateLayersOutsideRange =
updateBaseLayer + updateLayerCount <= layerStart || updateBaseLayer >= layerEnd; updateBaseLayer + updateLayerCount <= layerStart || updateBaseLayer >= layerEnd;
LevelIndex updateMipLevelVK = LevelIndex updateMipLevelVk =
isUpdateLevelOutsideRange ? LevelIndex(0) : toVKLevel(updateMipLevelGL); isUpdateLevelOutsideRange ? LevelIndex(0) : toVkLevel(updateMipLevelGL);
// Additionally, if updates to this level are specifically asked to be skipped, skip them. // Additionally, if updates to this level are specifically asked to be skipped, skip them.
// This can happen when recreating an image that has been partially incompatibly redefined, // This can happen when recreating an image that has been partially incompatibly redefined,
// in which case only updates to the levels that haven't been redefined should be flushed. // in which case only updates to the levels that haven't been redefined should be flushed.
if (isUpdateLevelOutsideRange || areUpdateLayersOutsideRange || if (isUpdateLevelOutsideRange || areUpdateLayersOutsideRange ||
skipLevelsMask.test(updateMipLevelVK.get())) skipLevelsMask.test(updateMipLevelVk.get()))
{ {
updatesToKeep.emplace_back(update); updatesToKeep.emplace_back(update);
continue; continue;
...@@ -4585,15 +4585,15 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk, ...@@ -4585,15 +4585,15 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
// we need to change miplevel to vk::LevelIndex. // we need to change miplevel to vk::LevelIndex.
if (update.updateSource == UpdateSource::Clear) if (update.updateSource == UpdateSource::Clear)
{ {
update.clear.levelIndex = updateMipLevelVK.get(); update.clear.levelIndex = updateMipLevelVk.get();
} }
else if (update.updateSource == UpdateSource::Buffer) else if (update.updateSource == UpdateSource::Buffer)
{ {
update.buffer.copyRegion.imageSubresource.mipLevel = updateMipLevelVK.get(); update.buffer.copyRegion.imageSubresource.mipLevel = updateMipLevelVk.get();
} }
else if (update.updateSource == UpdateSource::Image) else if (update.updateSource == UpdateSource::Image)
{ {
update.image.copyRegion.dstSubresource.mipLevel = updateMipLevelVK.get(); update.image.copyRegion.dstSubresource.mipLevel = updateMipLevelVk.get();
} }
if (updateLayerCount >= kMaxParallelSubresourceUpload) if (updateLayerCount >= kMaxParallelSubresourceUpload)
...@@ -4606,7 +4606,7 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk, ...@@ -4606,7 +4606,7 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
{ {
const uint64_t subresourceHashRange = angle::Bit<uint64_t>(updateLayerCount) - 1; const uint64_t subresourceHashRange = angle::Bit<uint64_t>(updateLayerCount) - 1;
const uint32_t subresourceHashOffset = const uint32_t subresourceHashOffset =
(updateMipLevelVK.get() * mLayerCount + updateBaseLayer) % (updateMipLevelVk.get() * mLayerCount + updateBaseLayer) %
kMaxParallelSubresourceUpload; kMaxParallelSubresourceUpload;
const uint64_t subresourceHash = const uint64_t subresourceHash =
ANGLE_ROTL64(subresourceHashRange, subresourceHashOffset); ANGLE_ROTL64(subresourceHashRange, subresourceHashOffset);
...@@ -4622,7 +4622,7 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk, ...@@ -4622,7 +4622,7 @@ angle::Result ImageHelper::flushStagedUpdates(ContextVk *contextVk,
if (update.updateSource == UpdateSource::Clear) if (update.updateSource == UpdateSource::Clear)
{ {
clear(update.clear.aspectFlags, update.clear.value, updateMipLevelVK, updateBaseLayer, clear(update.clear.aspectFlags, update.clear.value, updateMipLevelVk, updateBaseLayer,
updateLayerCount, commandBuffer); updateLayerCount, commandBuffer);
// Remember the latest operation is a clear call // Remember the latest operation is a clear call
mCurrentSingleClearValue = update.clear; mCurrentSingleClearValue = update.clear;
...@@ -4742,8 +4742,8 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask) ...@@ -4742,8 +4742,8 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask)
} }
// If level is skipped (because incompatibly redefined), don't remove any of its updates. // If level is skipped (because incompatibly redefined), don't remove any of its updates.
const LevelIndex updateMipLevelVK = toVKLevel(updateMipLevelGL); const LevelIndex updateMipLevelVk = toVkLevel(updateMipLevelGL);
if (skipLevelsMask.test(updateMipLevelVK.get())) if (skipLevelsMask.test(updateMipLevelVk.get()))
{ {
return false; return false;
} }
...@@ -4761,10 +4761,10 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask) ...@@ -4761,10 +4761,10 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask)
updateLayersMask <<= updateBaseLayer; updateLayersMask <<= updateBaseLayer;
const bool isColorOrDepthSuperseded = const bool isColorOrDepthSuperseded =
!hasColorOrDepth || (levelSupersededLayers[kIndexColorOrDepth][updateMipLevelVK.get()] & !hasColorOrDepth || (levelSupersededLayers[kIndexColorOrDepth][updateMipLevelVk.get()] &
updateLayersMask) == updateLayersMask; updateLayersMask) == updateLayersMask;
const bool isStencilSuperseded = const bool isStencilSuperseded =
!hasStencil || (levelSupersededLayers[kIndexStencil][updateMipLevelVK.get()] & !hasStencil || (levelSupersededLayers[kIndexStencil][updateMipLevelVk.get()] &
updateLayersMask) == updateLayersMask; updateLayersMask) == updateLayersMask;
if (isColorOrDepthSuperseded && isStencilSuperseded) if (isColorOrDepthSuperseded && isStencilSuperseded)
...@@ -4774,7 +4774,7 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask) ...@@ -4774,7 +4774,7 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask)
// Get the area this update affects. Note that clear updates always clear the whole // Get the area this update affects. Note that clear updates always clear the whole
// subresource. // subresource.
const gl::Extents &levelExtent = levelExtents[updateMipLevelVK.get()]; const gl::Extents &levelExtent = levelExtents[updateMipLevelVk.get()];
gl::Box updateBox(gl::kOffsetZero, levelExtent); gl::Box updateBox(gl::kOffsetZero, levelExtent);
if (update.updateSource == UpdateSource::Buffer) if (update.updateSource == UpdateSource::Buffer)
...@@ -4792,12 +4792,12 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask) ...@@ -4792,12 +4792,12 @@ void ImageHelper::removeSupersededUpdates(gl::TexLevelMask skipLevelsMask)
{ {
if (hasColorOrDepth) if (hasColorOrDepth)
{ {
levelSupersededLayers[kIndexColorOrDepth][updateMipLevelVK.get()] |= levelSupersededLayers[kIndexColorOrDepth][updateMipLevelVk.get()] |=
updateLayersMask; updateLayersMask;
} }
if (hasStencil) if (hasStencil)
{ {
levelSupersededLayers[kIndexStencil][updateMipLevelVK.get()] |= updateLayersMask; levelSupersededLayers[kIndexStencil][updateMipLevelVk.get()] |= updateLayersMask;
} }
} }
...@@ -4852,7 +4852,7 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk, ...@@ -4852,7 +4852,7 @@ angle::Result ImageHelper::copyImageDataToBuffer(ContextVk *contextVk,
nullptr)); nullptr));
*bufferOut = contextVk->getStagingBuffer()->getCurrentBuffer(); *bufferOut = contextVk->getStagingBuffer()->getCurrentBuffer();
LevelIndex sourceLevelVk = toVKLevel(sourceLevelGL); LevelIndex sourceLevelVk = toVkLevel(sourceLevelGL);
VkBufferImageCopy regions[2] = {}; VkBufferImageCopy regions[2] = {};
// Default to non-combined DS case // Default to non-combined DS case
...@@ -4972,8 +4972,8 @@ angle::Result ImageHelper::readPixelsForGetImage(ContextVk *contextVk, ...@@ -4972,8 +4972,8 @@ angle::Result ImageHelper::readPixelsForGetImage(ContextVk *contextVk,
PackPixelsParams params; PackPixelsParams params;
GLuint outputSkipBytes = 0; GLuint outputSkipBytes = 0;
const LevelIndex levelVK = toVKLevel(levelGL); const LevelIndex levelVk = toVkLevel(levelGL);
const gl::Extents mipExtents = getLevelExtents(levelVK); const gl::Extents mipExtents = getLevelExtents(levelVk);
gl::Rectangle area(0, 0, mipExtents.width, mipExtents.height); gl::Rectangle area(0, 0, mipExtents.width, mipExtents.height);
ANGLE_TRY(GetReadPixelsParams(contextVk, packState, packBuffer, format, type, area, area, ANGLE_TRY(GetReadPixelsParams(contextVk, packState, packBuffer, format, type, area, area,
...@@ -5059,7 +5059,7 @@ angle::Result ImageHelper::readPixels(ContextVk *contextVk, ...@@ -5059,7 +5059,7 @@ angle::Result ImageHelper::readPixels(ContextVk *contextVk,
VkImageSubresourceLayers srcSubresource = {}; VkImageSubresourceLayers srcSubresource = {};
srcSubresource.aspectMask = copyAspectFlags; srcSubresource.aspectMask = copyAspectFlags;
srcSubresource.mipLevel = toVKLevel(levelGL).get(); srcSubresource.mipLevel = toVkLevel(levelGL).get();
srcSubresource.baseArrayLayer = layer; srcSubresource.baseArrayLayer = layer;
srcSubresource.layerCount = 1; srcSubresource.layerCount = 1;
...@@ -5606,7 +5606,7 @@ angle::Result ImageViewHelper::initSRGBReadViewsImpl(ContextVk *contextVk, ...@@ -5606,7 +5606,7 @@ angle::Result ImageViewHelper::initSRGBReadViewsImpl(ContextVk *contextVk,
angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk, angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk,
gl::TextureType viewType, gl::TextureType viewType,
const ImageHelper &image, const ImageHelper &image,
LevelIndex levelVK, LevelIndex levelVk,
uint32_t layer, uint32_t layer,
VkImageUsageFlags imageUsageFlags, VkImageUsageFlags imageUsageFlags,
VkFormat vkImageFormat, VkFormat vkImageFormat,
...@@ -5616,7 +5616,7 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk, ...@@ -5616,7 +5616,7 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk,
retain(&contextVk->getResourceUseList()); retain(&contextVk->getResourceUseList());
ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, levelVK, image.getLevelCount()); ImageView *imageView = GetLevelImageView(&mLevelDrawImageViews, levelVk, image.getLevelCount());
*imageViewOut = imageView; *imageViewOut = imageView;
if (imageView->valid()) if (imageView->valid())
...@@ -5626,13 +5626,13 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk, ...@@ -5626,13 +5626,13 @@ angle::Result ImageViewHelper::getLevelDrawImageView(ContextVk *contextVk,
// Create the view. Note that storage images are not affected by swizzle parameters. // Create the view. Note that storage images are not affected by swizzle parameters.
return image.initAliasedLayerImageView(contextVk, viewType, image.getAspectFlags(), return image.initAliasedLayerImageView(contextVk, viewType, image.getAspectFlags(),
gl::SwizzleState(), imageView, levelVK, 1, layer, gl::SwizzleState(), imageView, levelVk, 1, layer,
image.getLayerCount(), imageUsageFlags, vkImageFormat); image.getLayerCount(), imageUsageFlags, vkImageFormat);
} }
angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk, angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk,
const ImageHelper &image, const ImageHelper &image,
LevelIndex levelVK, LevelIndex levelVk,
uint32_t layer, uint32_t layer,
const ImageView **imageViewOut) const ImageView **imageViewOut)
{ {
...@@ -5652,7 +5652,7 @@ angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk, ...@@ -5652,7 +5652,7 @@ angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk,
ASSERT(mLayerLevelDrawImageViews.size() > layer); ASSERT(mLayerLevelDrawImageViews.size() > layer);
ImageView *imageView = ImageView *imageView =
GetLevelImageView(&mLayerLevelDrawImageViews[layer], levelVK, image.getLevelCount()); GetLevelImageView(&mLayerLevelDrawImageViews[layer], levelVk, image.getLevelCount());
*imageViewOut = imageView; *imageViewOut = imageView;
if (imageView->valid()) if (imageView->valid())
...@@ -5665,7 +5665,7 @@ angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk, ...@@ -5665,7 +5665,7 @@ angle::Result ImageViewHelper::getLevelLayerDrawImageView(ContextVk *contextVk,
// don't have swizzle. // don't have swizzle.
gl::TextureType viewType = Get2DTextureType(1, image.getSamples()); gl::TextureType viewType = Get2DTextureType(1, image.getSamples());
return image.initLayerImageView(contextVk, viewType, image.getAspectFlags(), gl::SwizzleState(), return image.initLayerImageView(contextVk, viewType, image.getAspectFlags(), gl::SwizzleState(),
imageView, levelVK, 1, layer, 1); imageView, levelVk, 1, layer, 1);
} }
ImageViewSubresourceSerial ImageViewHelper::getSubresourceSerial(gl::LevelIndex levelGL, ImageViewSubresourceSerial ImageViewHelper::getSubresourceSerial(gl::LevelIndex levelGL,
......
src/libANGLE/renderer/vulkan/vk_helpers.h
...@@ -1247,7 +1247,7 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1247,7 +1247,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount) const; uint32_t layerCount) const;
...@@ -1256,7 +1256,7 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1256,7 +1256,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -1267,7 +1267,7 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1267,7 +1267,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount); uint32_t levelCount);
// Create a 2D[Array] for staging purposes. Used by: // Create a 2D[Array] for staging purposes. Used by:
// //
...@@ -1322,10 +1322,10 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1322,10 +1322,10 @@ class ImageHelper final : public Resource, public angle::Subject
ImageLayout getCurrentImageLayout() const { return mCurrentLayout; } ImageLayout getCurrentImageLayout() const { return mCurrentLayout; }
VkImageLayout getCurrentLayout() const; 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 // Helper function to calculate the extents of a render target created for a certain mip of the
// image. // image.
gl::Extents getLevelExtents2D(LevelIndex levelVK) const; gl::Extents getLevelExtents2D(LevelIndex levelVk) const;
bool isDepthOrStencil() const; bool isDepthOrStencil() const;
// Clear either color or depth/stencil based on image format. // Clear either color or depth/stencil based on image format.
...@@ -1519,8 +1519,8 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1519,8 +1519,8 @@ class ImageHelper final : public Resource, public angle::Subject
gl::LevelIndex getBaseLevel() const { return mBaseLevel; } gl::LevelIndex getBaseLevel() const { return mBaseLevel; }
void setBaseAndMaxLevels(gl::LevelIndex baseLevel, gl::LevelIndex maxLevel); void setBaseAndMaxLevels(gl::LevelIndex baseLevel, gl::LevelIndex maxLevel);
gl::LevelIndex getMaxLevel() const { return mMaxLevel; } gl::LevelIndex getMaxLevel() const { return mMaxLevel; }
LevelIndex toVKLevel(gl::LevelIndex levelIndexGL) const; LevelIndex toVkLevel(gl::LevelIndex levelIndexGL) const;
gl::LevelIndex toGLLevel(LevelIndex levelIndexVK) const; gl::LevelIndex toGLLevel(LevelIndex levelIndexVk) const;
angle::Result copyImageDataToBuffer(ContextVk *contextVk, angle::Result copyImageDataToBuffer(ContextVk *contextVk,
gl::LevelIndex sourceLevelGL, gl::LevelIndex sourceLevelGL,
...@@ -1658,7 +1658,7 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1658,7 +1658,7 @@ class ImageHelper final : public Resource, public angle::Subject
void stageClearIfEmulatedFormat(Context *context); void stageClearIfEmulatedFormat(Context *context);
void clearColor(const VkClearColorValue &color, void clearColor(const VkClearColorValue &color,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -1666,7 +1666,7 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1666,7 +1666,7 @@ class ImageHelper final : public Resource, public angle::Subject
void clearDepthStencil(VkImageAspectFlags clearAspectFlags, void clearDepthStencil(VkImageAspectFlags clearAspectFlags,
const VkClearDepthStencilValue &depthStencil, const VkClearDepthStencilValue &depthStencil,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -1684,7 +1684,7 @@ class ImageHelper final : public Resource, public angle::Subject ...@@ -1684,7 +1684,7 @@ class ImageHelper final : public Resource, public angle::Subject
VkImageAspectFlags aspectMask, VkImageAspectFlags aspectMask,
const gl::SwizzleState &swizzleMap, const gl::SwizzleState &swizzleMap,
ImageView *imageViewOut, ImageView *imageViewOut,
LevelIndex baseMipLevelVK, LevelIndex baseMipLevelVk,
uint32_t levelCount, uint32_t levelCount,
uint32_t baseArrayLayer, uint32_t baseArrayLayer,
uint32_t layerCount, uint32_t layerCount,
...@@ -1861,7 +1861,7 @@ class ImageViewHelper : angle::NonCopyable ...@@ -1861,7 +1861,7 @@ class ImageViewHelper : angle::NonCopyable
angle::Result getLevelDrawImageView(ContextVk *contextVk, angle::Result getLevelDrawImageView(ContextVk *contextVk,
gl::TextureType viewType, gl::TextureType viewType,
const ImageHelper &image, const ImageHelper &image,
LevelIndex levelVK, LevelIndex levelVk,
uint32_t layer, uint32_t layer,
VkImageUsageFlags imageUsageFlags, VkImageUsageFlags imageUsageFlags,
VkFormat vkImageFormat, VkFormat vkImageFormat,
...@@ -1870,7 +1870,7 @@ class ImageViewHelper : angle::NonCopyable ...@@ -1870,7 +1870,7 @@ class ImageViewHelper : angle::NonCopyable
// Creates a view with a single layer of the level. // Creates a view with a single layer of the level.
angle::Result getLevelLayerDrawImageView(ContextVk *contextVk, angle::Result getLevelLayerDrawImageView(ContextVk *contextVk,
const ImageHelper &image, const ImageHelper &image,
LevelIndex levelVK, LevelIndex levelVk,
uint32_t layer, uint32_t layer,
const ImageView **imageViewOut); const ImageView **imageViewOut);
......
src/libANGLE/renderer/vulkan/vk_utils.cpp
...@@ -1341,9 +1341,9 @@ GLuint GetSampleCount(VkSampleCountFlags supportedCounts, GLuint requestedCount) ...@@ -1341,9 +1341,9 @@ GLuint GetSampleCount(VkSampleCountFlags supportedCounts, GLuint requestedCount)
return 0; 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 vk_gl
} // namespace rx } // namespace rx
src/libANGLE/renderer/vulkan/vk_utils.h
...@@ -899,7 +899,7 @@ GLuint GetMaxSampleCount(VkSampleCountFlags sampleCounts); ...@@ -899,7 +899,7 @@ GLuint GetMaxSampleCount(VkSampleCountFlags sampleCounts);
// Return a supported sample count that's at least as large as the requested one. // Return a supported sample count that's at least as large as the requested one.
GLuint GetSampleCount(VkSampleCountFlags supportedCounts, GLuint requestedCount); 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 vk_gl
} // namespace rx } // 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