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

• Show log

  Commit

• Hash : e2d2270a
  Author :
  Date : 2018-09-19T08:11:48
  

  Vulkan: Merge append/beginWriteResource.
  
  The new API is named 'recordCommands'.
  
  These two APIs were basically doing the same thing. We don't need to
  have an understanding of creating a new graph node to know that we
  want to record some Vulkan commands to a command buffer. The prior
  design was actually masking a bug where we would allow appending
  commands to a command graph node that had already started a render
  pass. Fix this by adding a render pass check to recordCommands.
  
  Also removes 'hasStartedWriteResource' since this method wasn't used
  anywhere.
  
  Also renames 'onResourceChanged' to 'finishCurrentCommands'.
  
  Bug: angleproject:2828
  Change-Id: I00bd5b893fcfc37172b6c1706cb2f5fc57e79f54
  Reviewed-on: https://chromium-review.googlesource.com/1235654
  Commit-Queue: Jamie Madill <jmadill@chromium.org>
  Reviewed-by: Frank Henigman <fjhenigman@chromium.org>
  Reviewed-by: Geoff Lang <geofflang@chromium.org>
  

Download

• src/libANGLE/renderer/vulkan/RenderbufferVk.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.
  //
  // RenderbufferVk.cpp:
  //    Implements the class methods for RenderbufferVk.
  //
  
  #include "libANGLE/renderer/vulkan/RenderbufferVk.h"
  
  #include "libANGLE/Context.h"
  #include "libANGLE/renderer/vulkan/ContextVk.h"
  #include "libANGLE/renderer/vulkan/RendererVk.h"
  
  namespace rx
  {
  
  namespace
  {
  constexpr VkClearDepthStencilValue kDefaultClearDepthStencilValue = {0.0f, 1};
  constexpr VkClearColorValue kBlackClearColorValue                 = {{0}};
  
  }  // anonymous namespace
  
  RenderbufferVk::RenderbufferVk(const gl::RenderbufferState &state)
      : RenderbufferImpl(state), mRenderTarget(&mImage, &mImageView, this, 0)
  {
  }
  
  RenderbufferVk::~RenderbufferVk()
  {
  }
  
  gl::Error RenderbufferVk::onDestroy(const gl::Context *context)
  {
      ContextVk *contextVk = vk::GetImpl(context);
      RendererVk *renderer = contextVk->getRenderer();
  
      mImage.release(renderer->getCurrentQueueSerial(), renderer);
      renderer->releaseObject(getStoredQueueSerial(), &mImageView);
  
      return gl::NoError();
  }
  
  gl::Error RenderbufferVk::setStorage(const gl::Context *context,
                                       GLenum internalformat,
                                       size_t width,
                                       size_t height)
  {
      ContextVk *contextVk       = vk::GetImpl(context);
      RendererVk *renderer       = contextVk->getRenderer();
      const vk::Format &vkFormat = renderer->getFormat(internalformat);
  
      if (mImage.valid())
      {
          // Check against the state if we need to recreate the storage.
          if (internalformat != mState.getFormat().info->internalFormat ||
              static_cast<GLsizei>(width) != mState.getWidth() ||
              static_cast<GLsizei>(height) != mState.getHeight())
          {
              mImage.release(renderer->getCurrentQueueSerial(), renderer);
              renderer->releaseObject(getStoredQueueSerial(), &mImageView);
          }
      }
  
      if (!mImage.valid() && (width != 0 || height != 0))
      {
          const angle::Format &textureFormat = vkFormat.textureFormat();
          bool isDepthOrStencilFormat = textureFormat.depthBits > 0 || textureFormat.stencilBits > 0;
          const VkImageUsageFlags usage =
              VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT |
              VK_IMAGE_USAGE_SAMPLED_BIT |
              (textureFormat.redBits > 0 ? VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT : 0) |
              (isDepthOrStencilFormat ? VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT : 0);
  
          gl::Extents extents(static_cast<int>(width), static_cast<int>(height), 1);
          ANGLE_TRY(mImage.init(contextVk, gl::TextureType::_2D, extents, vkFormat, 1, usage, 1));
  
          VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
          ANGLE_TRY(mImage.initMemory(contextVk, renderer->getMemoryProperties(), flags));
  
          VkImageAspectFlags aspect = vk::GetFormatAspectFlags(textureFormat);
  
          ANGLE_TRY(mImage.initImageView(contextVk, gl::TextureType::_2D, aspect, gl::SwizzleState(),
                                         &mImageView, 1));
  
          // TODO(jmadill): Fold this into the RenderPass load/store ops. http://anglebug.com/2361
          vk::CommandBuffer *commandBuffer = nullptr;
          ANGLE_TRY(recordCommands(contextVk, &commandBuffer));
  
          if (isDepthOrStencilFormat)
          {
              mImage.clearDepthStencil(aspect, kDefaultClearDepthStencilValue, commandBuffer);
          }
          else
          {
              mImage.clearColor(kBlackClearColorValue, 0, 1, commandBuffer);
          }
      }
  
      return gl::NoError();
  }
  
  gl::Error RenderbufferVk::setStorageMultisample(const gl::Context *context,
                                                  size_t samples,
                                                  GLenum internalformat,
                                                  size_t width,
                                                  size_t height)
  {
      UNIMPLEMENTED();
      return gl::InternalError();
  }
  
  gl::Error RenderbufferVk::setStorageEGLImageTarget(const gl::Context *context, egl::Image *image)
  {
      UNIMPLEMENTED();
      return gl::InternalError();
  }
  
  gl::Error RenderbufferVk::getAttachmentRenderTarget(const gl::Context * /*context*/,
                                                      GLenum /*binding*/,
                                                      const gl::ImageIndex & /*imageIndex*/,
                                                      FramebufferAttachmentRenderTarget **rtOut)
  {
      ASSERT(mImage.valid());
      *rtOut = &mRenderTarget;
      return gl::NoError();
  }
  
  gl::Error RenderbufferVk::initializeContents(const gl::Context *context,
                                               const gl::ImageIndex &imageIndex)
  {
      UNIMPLEMENTED();
      return gl::NoError();
  }
  
  }  // namespace rx
  

Download