Vulkan: Create TextureVk's Image lazily.

src/libANGLE/Texture.cpp

@@ -219,6 +219,12 @@ bool TextureState::isCubeComplete() const
     return true;
 }
 
+const ImageDesc &TextureState::getBaseLevelDesc() const
+{
+    ASSERT(mType != TextureType::CubeMap || isCubeComplete());
+    return getImageDesc(getBaseImageTarget(), getEffectiveBaseLevel());
+}
+
 void TextureState::setCrop(const gl::Rectangle& rect)
 {
     mCropRect = rect;

src/libANGLE/Texture.h

@@ -115,6 +115,9 @@ struct TextureState final : private angle::NonCopyable
     GLenum getUsage() const { return mUsage; }
     GLenum getDepthStencilTextureMode() const { return mDepthStencilTextureMode; }
 
+    // Returns the desc of the base level. Only valid for cube-complete/mip-complete textures.
+    const ImageDesc &getBaseLevelDesc() const;
+
     // GLES1 emulation: For GL_OES_draw_texture
     void setCrop(const gl::Rectangle& rect);
     const gl::Rectangle& getCrop() const;

src/libANGLE/renderer/Format.h

@@ -41,6 +41,8 @@ struct Format final : private angle::NonCopyable
     static const Format &Get(ID id);
     static ID InternalFormatToID(GLenum internalFormat);
 
+    constexpr bool hasDepthOrStencilBits() const;
+
     ID id;
 
     // The closest matching GL internal format for the storage this format uses. Note that this
@@ -108,6 +110,10 @@ constexpr Format::Format(ID id,
 {
 }
 
+constexpr bool Format::hasDepthOrStencilBits() const
+{
+    return depthBits > 0 || stencilBits > 0;
+}
 }  // namespace angle
 
 #include "libANGLE/renderer/Format_ID_autogen.inl"

src/libANGLE/renderer/vulkan/CommandGraph.cpp

@@ -12,6 +12,7 @@
 #include "libANGLE/renderer/vulkan/RenderTargetVk.h"
 #include "libANGLE/renderer/vulkan/RendererVk.h"
 #include "libANGLE/renderer/vulkan/vk_format_utils.h"
+#include "libANGLE/renderer/vulkan/vk_helpers.h"
 
 namespace rx
 {
@@ -142,7 +143,8 @@ void CommandGraphResource::onReadResource(CommandGraphNode *readingNode, Serial
 
 bool CommandGraphResource::checkResourceInUseAndRefreshDeps(RendererVk *renderer)
 {
-    if (!renderer->isResourceInUse(*this))
+    if (!renderer->isResourceInUse(*this) ||
+        (renderer->getCurrentQueueSerial() > mStoredQueueSerial))
     {
         mCurrentReadingNodes.clear();
         mCurrentWritingNode = nullptr;
@@ -243,6 +245,14 @@ void CommandGraphNode::storeRenderPassInfo(const Framebuffer &framebuffer,
 
 void CommandGraphNode::appendColorRenderTarget(Serial serial, RenderTargetVk *colorRenderTarget)
 {
+    ASSERT(mOutsideRenderPassCommands.valid());
+
+    // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
+    colorRenderTarget->image->changeLayoutWithStages(
+        VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+        &mOutsideRenderPassCommands);
+
     mRenderPassDesc.packColorAttachment(*colorRenderTarget->image);
     colorRenderTarget->resource->onWriteResource(this, serial);
 }
@@ -250,6 +260,19 @@ void CommandGraphNode::appendColorRenderTarget(Serial serial, RenderTargetVk *co
 void CommandGraphNode::appendDepthStencilRenderTarget(Serial serial,
                                                       RenderTargetVk *depthStencilRenderTarget)
 {
+    ASSERT(mOutsideRenderPassCommands.valid());
+    ASSERT(depthStencilRenderTarget->image->getFormat().textureFormat().hasDepthOrStencilBits());
+
+    // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
+    const angle::Format &format    = depthStencilRenderTarget->image->getFormat().textureFormat();
+    VkImageAspectFlags aspectFlags = (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
+                                     (format.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
+
+    depthStencilRenderTarget->image->changeLayoutWithStages(
+        aspectFlags, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+        VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
+        &mOutsideRenderPassCommands);
+
     mRenderPassDesc.packDepthStencilAttachment(*depthStencilRenderTarget->image);
     depthStencilRenderTarget->resource->onWriteResource(this, serial);
 }

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -174,6 +174,7 @@ gl::Error ContextVk::setupDraw(const gl::Context *context,
             ASSERT(texture);
 
             TextureVk *textureVk = vk::GetImpl(texture);
+            ANGLE_TRY(textureVk->ensureImageInitialized(mRenderer));
             textureVk->onReadResource(graphNode, mRenderer->getCurrentQueueSerial());
         }
     }

src/libANGLE/renderer/vulkan/FramebufferVk.cpp

@@ -568,11 +568,6 @@ gl::Error FramebufferVk::getCommandGraphNodeForDraw(const gl::Context *context,
         RenderTargetVk *colorRenderTarget = colorRenderTargets[colorIndex];
         ASSERT(colorRenderTarget);
 
-        // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
-        colorRenderTarget->image->changeLayoutWithStages(
-            VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
-            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-            commandBuffer);
         (*nodeOut)->appendColorRenderTarget(currentSerial, colorRenderTarget);
         attachmentClearValues.emplace_back(contextVk->getClearColorValue());
     }
@@ -580,15 +575,6 @@ gl::Error FramebufferVk::getCommandGraphNodeForDraw(const gl::Context *context,
     RenderTargetVk *depthStencilRenderTarget = mRenderTargetCache.getDepthStencil();
     if (depthStencilRenderTarget)
     {
-        // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
-        const angle::Format &format = depthStencilRenderTarget->image->getFormat().textureFormat();
-        VkImageAspectFlags aspectFlags = (format.depthBits > 0 ? VK_IMAGE_ASPECT_DEPTH_BIT : 0) |
-                                         (format.stencilBits > 0 ? VK_IMAGE_ASPECT_STENCIL_BIT : 0);
-
-        depthStencilRenderTarget->image->changeLayoutWithStages(
-            aspectFlags, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
-            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT,
-            commandBuffer);
         (*nodeOut)->appendDepthStencilRenderTarget(currentSerial, depthStencilRenderTarget);
         attachmentClearValues.emplace_back(contextVk->getClearDepthStencilValue());
     }

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -18,6 +18,31 @@
 namespace rx
 {
 
+class StagingStorage final : angle::NonCopyable
+{
+  public:
+    StagingStorage();
+    ~StagingStorage();
+
+    void release(RendererVk *renderer);
+
+    gl::Error stageSubresourceUpdate(ContextVk *contextVk,
+                                     const gl::Extents &extents,
+                                     const gl::InternalFormat &formatInfo,
+                                     const gl::PixelUnpackState &unpack,
+                                     GLenum type,
+                                     const uint8_t *pixels);
+
+    vk::Error flushUpdatesToImage(RendererVk *renderer,
+                                  vk::ImageHelper *image,
+                                  vk::CommandBuffer *commandBuffer);
+
+  private:
+    vk::DynamicBuffer mStagingBuffer;
+    VkBuffer mCurrentBufferHandle;
+    VkBufferImageCopy mCurrentCopyRegion;
+};
+
 class TextureVk : public TextureImpl, public vk::CommandGraphResource
 {
   public:
@@ -116,18 +141,16 @@ class TextureVk : public TextureImpl, public vk::CommandGraphResource
     const vk::ImageView &getImageView() const;
     const vk::Sampler &getSampler() const;
 
-  private:
-    gl::Error setSubImageImpl(ContextVk *contextVk,
-                              const gl::InternalFormat &formatInfo,
-                              const gl::PixelUnpackState &unpack,
-                              GLenum type,
-                              const uint8_t *pixels);
+    vk::Error ensureImageInitialized(RendererVk *renderer);
 
+  private:
     vk::ImageHelper mImage;
     vk::ImageView mImageView;
     vk::Sampler mSampler;
 
     RenderTargetVk mRenderTarget;
+
+    StagingStorage mStagingStorage;
 };
 
 }  // namespace rx

src/libANGLE/renderer/vulkan/VertexArrayVk.cpp

@@ -141,7 +141,6 @@ gl::Error VertexArrayVk::streamIndexData(RendererVk *renderer,
     ANGLE_TRY(mDynamicIndexData.flush(renderer->getDevice()));
 
     mCurrentElementArrayBufferOffset = offset;
-
     return gl::NoError();
 }
 

src/libANGLE/renderer/vulkan/vk_utils.cpp

@@ -429,6 +429,19 @@ void CommandBuffer::copyBuffer(const VkBuffer &srcBuffer,
     vkCmdCopyBuffer(mHandle, srcBuffer, destBuffer, regionCount, regions);
 }
 
+void CommandBuffer::copyBufferToImage(VkBuffer srcBuffer,
+                                      const Image &dstImage,
+                                      VkImageLayout dstImageLayout,
+                                      uint32_t regionCount,
+                                      const VkBufferImageCopy *regions)
+{
+    ASSERT(valid());
+    ASSERT(srcBuffer != VK_NULL_HANDLE);
+    ASSERT(dstImage.valid());
+    vkCmdCopyBufferToImage(mHandle, srcBuffer, dstImage.getHandle(), dstImageLayout, regionCount,
+                           regions);
+}
+
 void CommandBuffer::clearColorImage(const vk::Image &image,
                                     VkImageLayout imageLayout,
                                     const VkClearColorValue &color,
@@ -1251,8 +1264,21 @@ VkIndexType GetIndexType(GLenum elementType)
             return VK_INDEX_TYPE_MAX_ENUM;
     }
 }
-}  // namespace gl_vk
 
+void GetOffset(const gl::Offset &glOffset, VkOffset3D *vkOffset)
+{
+    vkOffset->x = glOffset.x;
+    vkOffset->y = glOffset.y;
+    vkOffset->z = glOffset.z;
+}
+
+void GetExtent(const gl::Extents &glExtent, VkExtent3D *vkExtent)
+{
+    vkExtent->width  = glExtent.width;
+    vkExtent->height = glExtent.height;
+    vkExtent->depth  = glExtent.depth;
+}
+}  // namespace gl_vk
 }  // namespace rx
 
 std::ostream &operator<<(std::ostream &stream, const rx::vk::Error &error)

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -356,6 +356,12 @@ class CommandBuffer : public WrappedObject<CommandBuffer, VkCommandBuffer>
                     uint32_t regionCount,
                     const VkBufferCopy *regions);
 
+    void copyBufferToImage(VkBuffer srcBuffer,
+                           const Image &dstImage,
+                           VkImageLayout dstImageLayout,
+                           uint32_t regionCount,
+                           const VkBufferImageCopy *regions);
+
     void copyImage(const Image &srcImage,
                    VkImageLayout srcImageLayout,
                    const Image &dstImage,
@@ -651,6 +657,8 @@ VkFrontFace GetFrontFace(GLenum frontFace);
 VkSampleCountFlagBits GetSamples(GLint sampleCount);
 VkComponentSwizzle GetSwizzle(const GLenum swizzle);
 VkIndexType GetIndexType(GLenum elementType);
+void GetOffset(const gl::Offset &glOffset, VkOffset3D *vkOffset);
+void GetExtent(const gl::Extents &glExtent, VkExtent3D *vkExtent);
 }  // namespace gl_vk
 
 }  // namespace rx