commit 0631e19bcb2352521818b2c72d9bb682d33ff862
author Jamie Madill <jmadill@chromium.org> Thu Apr 18 16:09:12 2019 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Apr 18 20:45:31 2019 +0000
tree b63a94b1afd1a3cb7e4d127a60c70c7c86e47c5f
parent 3b7758656e8286ad400ca7ffc02e44f5f0a78ba2

Vulkan: Rename Vulkan "Texture" format to "Image"

Also adds some comments to vk_format_utils.h.

Bug: angleproject:3372
Change-Id: I529b9b189e4cdfd400c3c981a47139727d9954ab
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1565062
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

diff --git a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
index 8d3ca85..566629e 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -45,7 +45,7 @@
                                                 RenderTargetVk *renderTarget)
 {
     GLenum implFormat =
-        renderTarget->getImageFormat().textureFormat().fboImplementationInternalFormat;
+        renderTarget->getImageFormat().imageFormat().fboImplementationInternalFormat;
     return gl::GetSizedInternalFormatInfo(implFormat);
 }
 
@@ -62,12 +62,12 @@
                                 RenderTargetVk *srcRenderTarget,
                                 RenderTargetVk *dstRenderTarget)
 {
-    const VkFormat srcFormat = srcRenderTarget->getImageFormat().vkTextureFormat;
-    const VkFormat dstFormat = dstRenderTarget->getImageFormat().vkTextureFormat;
+    const VkFormat srcFormat = srcRenderTarget->getImageFormat().vkImageFormat;
+    const VkFormat dstFormat = dstRenderTarget->getImageFormat().vkImageFormat;
 
     // Verifies if the draw and read images have the necessary prerequisites for blitting.
-    return renderer->hasTextureFormatFeatureBits(srcFormat, VK_FORMAT_FEATURE_BLIT_SRC_BIT) &&
-           renderer->hasTextureFormatFeatureBits(dstFormat, VK_FORMAT_FEATURE_BLIT_DST_BIT);
+    return renderer->hasImageFormatFeatureBits(srcFormat, VK_FORMAT_FEATURE_BLIT_SRC_BIT) &&
+           renderer->hasImageFormatFeatureBits(dstFormat, VK_FORMAT_FEATURE_BLIT_DST_BIT);
 }
 
 // Special rules apply to VkBufferImageCopy with depth/stencil. The components are tightly packed
@@ -539,7 +539,7 @@
                                               RenderTargetVk *drawRenderTarget)
 {
     RendererVk *renderer            = contextVk->getRenderer();
-    const angle::Format &readFormat = readRenderTarget->getImageFormat().textureFormat();
+    const angle::Format &readFormat = readRenderTarget->getImageFormat().imageFormat();
 
     ASSERT(aspect == VK_IMAGE_ASPECT_DEPTH_BIT || aspect == VK_IMAGE_ASPECT_STENCIL_BIT);
 
@@ -752,7 +752,7 @@
     const vk::Format &readImageFormat = readRenderTarget->getImageFormat();
     VkImageAspectFlags aspectMask =
         colorBlit ? VK_IMAGE_ASPECT_COLOR_BIT
-                  : vk::GetDepthStencilAspectFlags(readImageFormat.textureFormat());
+                  : vk::GetDepthStencilAspectFlags(readImageFormat.imageFormat());
     vk::ImageHelper *srcImage = readRenderTarget->getImageForRead(
         &mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
 
@@ -845,7 +845,7 @@
                 if (renderTarget)
                 {
                     const angle::Format &emulatedFormat =
-                        renderTarget->getImageFormat().textureFormat();
+                        renderTarget->getImageFormat().imageFormat();
                     updateActiveColorMasks(
                         colorIndex, emulatedFormat.redBits > 0, emulatedFormat.greenBits > 0,
                         emulatedFormat.blueBits > 0, emulatedFormat.alphaBits > 0);
@@ -1064,7 +1064,7 @@
         const RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
         ASSERT(colorRenderTarget);
 
-        params.colorFormat          = &colorRenderTarget->getImage().getFormat().textureFormat();
+        params.colorFormat          = &colorRenderTarget->getImage().getFormat().imageFormat();
         params.colorAttachmentIndex = colorIndex;
         params.colorMaskFlags       = colorMaskFlags;
         if (mEmulatedAlphaAttachmentMask[colorIndex])
@@ -1177,7 +1177,7 @@
     vk::ImageHelper *srcImage =
         renderTarget->getImageForRead(&mFramebuffer, vk::ImageLayout::TransferSrc, commandBuffer);
 
-    const angle::Format *readFormat = &srcImage->getFormat().textureFormat();
+    const angle::Format *readFormat = &srcImage->getFormat().imageFormat();
 
     if (copyAspectFlags != VK_IMAGE_ASPECT_COLOR_BIT)
     {