Vulkan: Move readPixels logic to ImageHelper.

This logic will be shared with ANGLE_get_image. Cleans up some of the graph access logic so it can work easily with TextureVk/RenderbufferVk. Bug: angleproject:3944 Change-Id: If069528f27b2c291d52de892c707562875b95227 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1879962 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>

Vulkan: Move readPixels logic to ImageHelper.
96ba0f12 · Jamie Madill · Commit Bot · 6f23b4b7 · 96ba0f12 · 96ba0f12
Commit 96ba0f12 authored Oct 28, 2019 by Jamie Madill Committed by Commit Bot Oct 29, 2019
4 changed files
--- a/src/libANGLE/renderer/ContextImpl.h
+++ b/src/libANGLE/renderer/ContextImpl.h
@@ -192,7 +192,7 @@ class ContextImpl : public GLImplFactory
    virtual angle::Result memoryBarrierByRegion(const gl::Context *context,
                                                GLbitfield barriers)                     = 0;

-    const gl::State &getState() { return mState; }
+    const gl::State &getState() const { return mState; }
    int getClientMajorVersion() const { return mState.getClientMajorVersion(); }
    int getClientMinorVersion() const { return mState.getClientMinorVersion(); }
    const gl::Caps &getCaps() const { return mState.getCaps(); }

--- a/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
+++ b/src/libANGLE/renderer/vulkan/FramebufferVk.cpp
--- a/src/libANGLE/renderer/vulkan/vk_helpers.cpp
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.cpp
--- a/src/libANGLE/renderer/vulkan/vk_helpers.h
+++ b/src/libANGLE/renderer/vulkan/vk_helpers.h
@@ -891,6 +891,23 @@ class ImageHelper final : public CommandGraphResource
                                        VkDeviceSize *bufferOffsetOut,
                                        uint8_t **outDataPtr);

+    static angle::Result GetReadPixelsParams(ContextVk *contextVk,
+                                             GLenum format,
+                                             GLenum type,
+                                             const gl::Rectangle &area,
+                                             const gl::Rectangle &clippedArea,
+                                             PackPixelsParams *paramsOut,
+                                             GLuint *skipBytesOut);
+
+    angle::Result readPixels(ContextVk *contextVk,
+                             const gl::Rectangle &area,
+                             const PackPixelsParams &packPixelsParams,
+                             VkImageAspectFlagBits copyAspectFlags,
+                             uint32_t level,
+                             uint32_t layer,
+                             void *pixels,
+                             DynamicBuffer *stagingBuffer);
+
  private:
    void forceChangeLayoutAndQueue(VkImageAspectFlags aspectMask,
                                   ImageLayout newLayout,