commit 93edca16eacf3ef6ce524459276f2ff05600331e
author Jamie Madill <jmadill@chromium.org> Fri Mar 30 10:43:18 2018 -0400
committer Commit Bot <commit-bot@chromium.org> Wed Apr 04 10:39:17 2018 +0000
tree b4ad158cb41b31aa8275b076e1f4762aa79bcef5
parent 6bc264aee686a8b814e4be1f49e25f1443151c48

Vulkan: Add an Image helper class.

This class wraps a lot of the common functionality of a vk::Image.
It keeps an associated DeviceMemory and ImageView.

Eventually we can probably merge this class with  RenderTargetVk. We
can also use it to implement the same functionality between
Renderbuffer and Texture and abstract different storage types, like
2D and Cube.

Bug: angleproject:2318

Change-Id: I39239f47b483cfb96290a15b06edd264f7f4bb34
Reviewed-on: https://chromium-review.googlesource.com/980772
Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
Reviewed-by: Luc Ferron <lucferron@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: 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 ca9f724..b32440c 100644
--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
@@ -261,9 +261,10 @@
     ASSERT(renderTarget);
 
     vk::Image *readImage = renderTarget->image;
-    vk::StagingImage stagingImage;
-    ANGLE_TRY(stagingImage.init(contextVk, TextureDimension::TEX_2D, *renderTarget->format,
-                                gl::Extents(area.width, area.height, 1), vk::StagingUsage::Read));
+    vk::ImageHelper stagingImage;
+    ANGLE_TRY(stagingImage.init2DStaging(
+        device, renderer->getMemoryProperties(), *renderTarget->format,
+        gl::Extents(area.width, area.height, 1), vk::StagingUsage::Read));
 
     vk::CommandBuffer *commandBuffer = nullptr;
     ANGLE_TRY(beginWriteResource(renderer, &commandBuffer));
@@ -302,10 +303,10 @@
 
     // TODO(jmadill): parameters
     uint8_t *mapPointer = nullptr;
-    ANGLE_TRY(
-        stagingImage.getDeviceMemory().map(device, 0, stagingImage.getSize(), 0, &mapPointer));
+    ANGLE_TRY(stagingImage.getDeviceMemory().map(device, 0, stagingImage.getAllocatedMemorySize(),
+                                                 0, &mapPointer));
 
-    const auto &angleFormat = renderTarget->format->textureFormat();
+    const angle::Format &angleFormat = renderTarget->format->textureFormat();
 
     // TODO(jmadill): Use pixel bytes from the ANGLE format directly.
     const auto &glFormat = gl::GetSizedInternalFormatInfo(angleFormat.glInternalFormat);