kc3-lang/angle/src/libANGLE/renderer/vulkan/RenderTargetVk.cpp

• Show log

  Commit

• Hash : 5a604a5f
  Author :
  Date : 2019-03-27T14:22:50
  

  Ensure framebuffer is up-to-date before drawing
  
  The dEQP-GLES2.functional.fbo.render.texsubimage.between_render_tex2d*
  test was failing because a TexSubImage call modifying the framebuffer
  wasn't being applied before a subsequent DrawElements call and thus
  getting an incorrect result.
  
  Bug: angleproject:3249
  Test: angle_deqp_gles2_tests --gtest_filter=dEQP.GLES2/functional_fbo_render_texsubimage_between_render_tex2d_rgb --use-angle=vulkan
  Change-Id: I90f791957e6536c5c62fb731d52cd486ab5c05c1
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1542361
  Commit-Queue: Courtney Goeltzenleuchter <courtneygo@google.com>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  

Download

• src/libANGLE/renderer/vulkan/RenderTargetVk.cpp

• //
  // Copyright 2016 The ANGLE Project Authors. All rights reserved.
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  //
  // RenderTargetVk:
  //   Wrapper around a Vulkan renderable resource, using an ImageView.
  //
  
  #include "libANGLE/renderer/vulkan/RenderTargetVk.h"
  
  #include "libANGLE/renderer/vulkan/CommandGraph.h"
  #include "libANGLE/renderer/vulkan/TextureVk.h"
  #include "libANGLE/renderer/vulkan/vk_format_utils.h"
  #include "libANGLE/renderer/vulkan/vk_helpers.h"
  
  namespace rx
  {
  RenderTargetVk::RenderTargetVk()
      : mImage(nullptr), mImageView(nullptr), mLevelIndex(0), mLayerIndex(0), mOwner(nullptr)
  {}
  
  RenderTargetVk::~RenderTargetVk() {}
  
  RenderTargetVk::RenderTargetVk(RenderTargetVk &&other)
      : mImage(other.mImage),
        mImageView(other.mImageView),
        mLevelIndex(other.mLevelIndex),
        mLayerIndex(other.mLayerIndex),
        mOwner(other.mOwner)
  {}
  
  void RenderTargetVk::init(vk::ImageHelper *image,
                            vk::ImageView *imageView,
                            size_t levelIndex,
                            size_t layerIndex,
                            TextureVk *owner)
  {
      mImage      = image;
      mImageView  = imageView;
      mLevelIndex = levelIndex;
      mLayerIndex = layerIndex;
      mOwner      = owner;
  }
  
  void RenderTargetVk::reset()
  {
      mImage      = nullptr;
      mImageView  = nullptr;
      mLevelIndex = 0;
      mLayerIndex = 0;
      mOwner      = nullptr;
  }
  
  angle::Result RenderTargetVk::onColorDraw(ContextVk *contextVk,
                                            vk::FramebufferHelper *framebufferVk,
                                            vk::CommandBuffer *commandBuffer,
                                            vk::RenderPassDesc *renderPassDesc)
  {
      ASSERT(commandBuffer->valid());
      ASSERT(!mImage->getFormat().textureFormat().hasDepthOrStencilBits());
  
      // Store the attachment info in the renderPassDesc.
      renderPassDesc->packAttachment(mImage->getFormat());
  
      ANGLE_TRY(ensureImageInitialized(contextVk));
  
      // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
      mImage->changeLayout(VK_IMAGE_ASPECT_COLOR_BIT, vk::ImageLayout::ColorAttachment,
                           commandBuffer);
  
      // Set up dependencies between the RT resource and the Framebuffer.
      mImage->addWriteDependency(framebufferVk);
  
      return angle::Result::Continue;
  }
  
  angle::Result RenderTargetVk::onDepthStencilDraw(ContextVk *contextVk,
                                                   vk::FramebufferHelper *framebufferVk,
                                                   vk::CommandBuffer *commandBuffer,
                                                   vk::RenderPassDesc *renderPassDesc)
  {
      ASSERT(commandBuffer->valid());
      ASSERT(mImage->getFormat().textureFormat().hasDepthOrStencilBits());
  
      // Store the attachment info in the renderPassDesc.
      renderPassDesc->packAttachment(mImage->getFormat());
  
      // TODO(jmadill): Use automatic layout transition. http://anglebug.com/2361
      const angle::Format &format    = mImage->getFormat().textureFormat();
      VkImageAspectFlags aspectFlags = vk::GetDepthStencilAspectFlags(format);
  
      ANGLE_TRY(ensureImageInitialized(contextVk));
  
      mImage->changeLayout(aspectFlags, vk::ImageLayout::DepthStencilAttachment, commandBuffer);
  
      // Set up dependencies between the RT resource and the Framebuffer.
      mImage->addWriteDependency(framebufferVk);
  
      return angle::Result::Continue;
  }
  
  vk::ImageHelper &RenderTargetVk::getImage()
  {
      ASSERT(mImage && mImage->valid());
      return *mImage;
  }
  
  const vk::ImageHelper &RenderTargetVk::getImage() const
  {
      ASSERT(mImage && mImage->valid());
      return *mImage;
  }
  
  vk::ImageView *RenderTargetVk::getDrawImageView() const
  {
      ASSERT(mImageView && mImageView->valid());
      return mImageView;
  }
  
  vk::ImageView *RenderTargetVk::getReadImageView() const
  {
      return getDrawImageView();
  }
  
  const vk::Format &RenderTargetVk::getImageFormat() const
  {
      ASSERT(mImage && mImage->valid());
      return mImage->getFormat();
  }
  
  gl::Extents RenderTargetVk::getExtents() const
  {
      ASSERT(mImage && mImage->valid());
      return mImage->getLevelExtents2D(mLevelIndex);
  }
  
  void RenderTargetVk::updateSwapchainImage(vk::ImageHelper *image, vk::ImageView *imageView)
  {
      ASSERT(image && image->valid() && imageView && imageView->valid());
      mImage     = image;
      mImageView = imageView;
      mOwner     = nullptr;
  }
  
  vk::ImageHelper *RenderTargetVk::getImageForRead(vk::CommandGraphResource *readingResource,
                                                   vk::ImageLayout layout,
                                                   vk::CommandBuffer *commandBuffer)
  {
      ASSERT(mImage && mImage->valid());
  
      // TODO(jmadill): Better simultaneous resource access. http://anglebug.com/2679
      //
      // A better alternative would be:
      //
      // if (mImage->isLayoutChangeNecessary(layout)
      // {
      //     vk::CommandBuffer *srcLayoutChange;
      //     ANGLE_TRY(mImage->recordCommands(contextVk, &srcLayoutChange));
      //     mImage->changeLayout(mImage->getAspectFlags(), layout, srcLayoutChange);
      // }
      // mImage->addReadDependency(readingResource);
      //
      // I.e. the transition should happen on a node generated from mImage itself.
      // However, this needs context to be available here, or all call sites changed
      // to perform the layout transition and set the dependency.
      mImage->addWriteDependency(readingResource);
  
      mImage->changeLayout(mImage->getAspectFlags(), layout, commandBuffer);
  
      return mImage;
  }
  
  vk::ImageHelper *RenderTargetVk::getImageForWrite(vk::CommandGraphResource *writingResource) const
  {
      ASSERT(mImage && mImage->valid());
      mImage->addWriteDependency(writingResource);
      return mImage;
  }
  
  angle::Result RenderTargetVk::ensureImageInitialized(ContextVk *contextVk)
  {
      if (mOwner)
      {
          return mOwner->ensureImageInitialized(contextVk);
      }
      return angle::Result::Continue;
  }
  
  }  // namespace rx
  

Download