kc3-lang/angle/src/tests/gl_tests/VulkanDescriptorSetTest.cpp

• Show log

  Commit

• Hash : f12e4123
  Author :
  Date : 2020-08-25T12:01:12
  

  Vulkan: Match descriptor pool sizes to descriptor set layouts
  
  When a descriptor pool is created, a list of descriptor types and counts
  are given to vkCreateDescriptorPool(). Later, when allocating a
  descriptor set from the pool, we pass along a descriptor set layout to
  vkAllocateDescriptorSets() which is used to determine how many of each
  type of descriptor (i.e. binding) to allocate from the pool.
  
  In order for our "free descriptor set" counts to be accurate for each
  pool, the descriptor pools need to be created with descriptor counts
  that match the descriptor set layout binding counts.
  
  This change fixes a bug where the descriptor set layouts were created
  with more bindings than the descriptor pool sizes, causing the "free
  descriptor set" count to be inaccurate, leading to allocating too many
  descriptor sets from a pool.
  
  Bug: angleproject:3570
  Test: VulkanDescriptorSetTest
  Change-Id: I660bf02d29a1291391fb15f39e6479bf348d0f83
  Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2391114
  Commit-Queue: Tim Van Patten <timvp@google.com>
  Reviewed-by: Charlie Lao <cclao@google.com>
  Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
  Reviewed-by: Jamie Madill <jmadill@chromium.org>
  

Download

• src/tests/gl_tests/VulkanDescriptorSetTest.cpp

• //
  // Copyright 2020 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.
  //
  // VulkanDescriptorSetTest:
  //   Various tests related for Vulkan descriptor sets.
  //
  
  #include "test_utils/ANGLETest.h"
  #include "test_utils/gl_raii.h"
  
  #include "libANGLE/Context.h"
  #include "libANGLE/angletypes.h"
  #include "libANGLE/renderer/vulkan/ContextVk.h"
  #include "libANGLE/renderer/vulkan/ProgramVk.h"
  #include "libANGLE/renderer/vulkan/vk_helpers.h"
  
  using namespace angle;
  
  namespace
  {
  
  class VulkanDescriptorSetTest : public ANGLETest
  {
    protected:
      VulkanDescriptorSetTest() {}
  
      void testSetUp() override
      {
          mMaxSetsPerPool = rx::vk::DynamicDescriptorPool::GetMaxSetsPerPoolForTesting();
      }
  
      void testTearDown() override
      {
          rx::vk::DynamicDescriptorPool::SetMaxSetsPerPoolForTesting(mMaxSetsPerPool);
      }
  
      static constexpr uint32_t kMaxSetsForTesting = 1;
  
      void limitMaxSets()
      {
          rx::vk::DynamicDescriptorPool::SetMaxSetsPerPoolForTesting(kMaxSetsForTesting);
      }
  
    private:
      uint32_t mMaxSetsPerPool;
  };
  
  // Test atomic counter read.
  TEST_P(VulkanDescriptorSetTest, AtomicCounterReadLimitedDescriptorPool)
  {
      // Skipping due to a bug on the Qualcomm Vulkan Android driver.
      // http://anglebug.com/3726
      ANGLE_SKIP_TEST_IF(IsAndroid() && IsVulkan());
  
      // Skipping test while we work on enabling atomic counter buffer support in th D3D renderer.
      // http://anglebug.com/1729
      ANGLE_SKIP_TEST_IF(IsD3D11());
  
      // Must be before program creation to limit the descriptor pool sizes when creating the pipeline
      // layout.
      limitMaxSets();
  
      constexpr char kFS[] =
          "#version 310 es\n"
          "precision highp float;\n"
          "layout(binding = 0, offset = 4) uniform atomic_uint ac;\n"
          "out highp vec4 my_color;\n"
          "void main()\n"
          "{\n"
          "    my_color = vec4(0.0);\n"
          "    uint a1 = atomicCounter(ac);\n"
          "    if (a1 == 3u) my_color = vec4(1.0);\n"
          "}\n";
  
      ANGLE_GL_PROGRAM(program, essl31_shaders::vs::Simple(), kFS);
  
      glUseProgram(program.get());
  
      // The initial value of counter 'ac' is 3u.
      unsigned int bufferData[3] = {11u, 3u, 1u};
      GLBuffer atomicCounterBuffer;
      glBindBuffer(GL_ATOMIC_COUNTER_BUFFER, atomicCounterBuffer);
      glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, 0, atomicCounterBuffer);
  
      for (int i = 0; i < 5; ++i)
      {
          glBufferData(GL_ATOMIC_COUNTER_BUFFER, sizeof(bufferData), bufferData, GL_STATIC_DRAW);
          drawQuad(program.get(), essl31_shaders::PositionAttrib(), 0.0f);
          ASSERT_GL_NO_ERROR();
          EXPECT_PIXEL_COLOR_EQ(0, 0, GLColor::white);
      }
  }
  
  ANGLE_INSTANTIATE_TEST(VulkanDescriptorSetTest, ES31_VULKAN(), ES31_VULKAN_SWIFTSHADER());
  
  }  // namespace

Download