commit 6298d2b70cb67bb929f7817f2186f618ec8f1ca1
author Corentin Wallez <cwallez@chromium.org> Thu Oct 15 09:05:03 2020 +0000
committer Commit Bot service account <commit-bot@chromium.org> Thu Oct 15 09:05:03 2020 +0000
tree fe748c2f43016f7a9ddef66bb54b7faa74ce008f
parent 84b70a6e4d93dc5e86985d0372d8f93ed3eae6c0

Format: Move the TexelBlockInfo inside an AspectInfo.

In follow up CLs additional will be added to the AspectInfo, like the
supported component types.

Also simplify the logic for GetTexelInfo since all aspects are the first
aspects, except stencil which is always stencil8.

Bug: dawn:517
Change-Id: Iebbcb8a7f8fa2c4b7b06f65d6e4e8917c0a85366
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/30100
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>

src/dawn_native/vulkan/UtilsVulkan.cpp

diff --git a/src/dawn_native/vulkan/UtilsVulkan.cpp b/src/dawn_native/vulkan/UtilsVulkan.cpp
index 967d2a7..a78bfef 100644
--- a/src/dawn_native/vulkan/UtilsVulkan.cpp
+++ b/src/dawn_native/vulkan/UtilsVulkan.cpp
@@ -108,11 +108,10 @@
         region.bufferOffset = dataLayout.offset;
         // In Vulkan the row length is in texels while it is in bytes for Dawn
         const TexelBlockInfo& blockInfo =
-            texture->GetFormat().GetTexelBlockInfo(textureCopy.aspect);
-        ASSERT(dataLayout.bytesPerRow % blockInfo.blockByteSize == 0);
-        region.bufferRowLength =
-            dataLayout.bytesPerRow / blockInfo.blockByteSize * blockInfo.blockWidth;
-        region.bufferImageHeight = dataLayout.rowsPerImage * blockInfo.blockHeight;
+            texture->GetFormat().GetAspectInfo(textureCopy.aspect).block;
+        ASSERT(dataLayout.bytesPerRow % blockInfo.byteSize == 0);
+        region.bufferRowLength = dataLayout.bytesPerRow / blockInfo.byteSize * blockInfo.width;
+        region.bufferImageHeight = dataLayout.rowsPerImage * blockInfo.height;
 
         region.imageSubresource.aspectMask = VulkanAspectMask(textureCopy.aspect);
         region.imageSubresource.mipLevel = textureCopy.mipLevel;