tests: Cleanup of DescriptorBuffers

Author: spencer-lunarg

tests/framework/binding.cpp

@@ -1774,6 +1774,18 @@ void DescriptorSetLayout::Init(const Device &dev, const VkDescriptorSetLayoutCre
     NON_DISPATCHABLE_HANDLE_INIT(vk::CreateDescriptorSetLayout, dev, &info);
 }
 
+VkDeviceSize DescriptorSetLayout::GetDescriptorBufferSize() const {
+    VkDeviceSize size = 0;
+    vk::GetDescriptorSetLayoutSizeEXT(device(), handle(), &size);
+    return size;
+}
+
+VkDeviceSize DescriptorSetLayout::GetDescriptorBufferBindingOffset(uint32_t binding) const {
+    VkDeviceSize size = 0;
+    vk::GetDescriptorSetLayoutBindingOffsetEXT(device(), handle(), binding, &size);
+    return size;
+}
+
 NON_DISPATCHABLE_HANDLE_DTOR(DescriptorPool, vk::DestroyDescriptorPool)
 
 void DescriptorPool::Init(const Device &dev, const VkDescriptorPoolCreateInfo &info) {

tests/framework/binding.h

@@ -990,6 +990,11 @@ class DescriptorSetLayout : public internal::NonDispHandle<VkDescriptorSetLayout
 
     // vkCreateDescriptorSetLayout()
     void Init(const Device &dev, const VkDescriptorSetLayoutCreateInfo &info);
+
+    // vkGetDescriptorSetLayoutSizeEXT
+    VkDeviceSize GetDescriptorBufferSize() const;
+    // vkGetDescriptorSetLayoutBindingOffsetEXT
+    VkDeviceSize GetDescriptorBufferBindingOffset(uint32_t binding) const;
 };
 
 class DescriptorPool : public internal::NonDispHandle<VkDescriptorPool> {

tests/framework/layer_validation_tests.h

@@ -264,6 +264,8 @@ class AndroidExternalResolveTest : public VkLayerTest {
 class DescriptorBufferTest : public VkLayerTest {
   public:
     void InitBasicDescriptorBuffer(void *instance_pnext = nullptr);
+
+    VkPhysicalDeviceDescriptorBufferPropertiesEXT descriptor_buffer_properties = vku::InitStructHelper();
 };
 
 class DescriptorIndexingTest : public VkLayerTest {

tests/unit/debug_printf.cpp

@@ -4976,9 +4976,7 @@ TEST_F(NegativeDebugPrintf, DescriptorBuffer) {
     pipe_layout_ci.pSetLayouts = &ds_layout.handle();
     vkt::PipelineLayout pipeline_layout(*m_device, pipe_layout_ci);
 
-    VkDeviceSize ds_layout_size = 0;
-    vk::GetDescriptorSetLayoutSizeEXT(device(), ds_layout, &ds_layout_size);
-
+    VkDeviceSize ds_layout_size = ds_layout.GetDescriptorBufferSize();
     ds_layout_size = Align(ds_layout_size, descriptor_buffer_properties.descriptorBufferOffsetAlignment);
 
     vkt::Buffer descriptor_buffer(*m_device, ds_layout_size, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,

tests/unit/descriptor_buffer.cpp

@@ -15,15 +15,22 @@
 void DescriptorBufferTest::InitBasicDescriptorBuffer(void *instance_pnext) {
     SetTargetApiVersion(VK_API_VERSION_1_2);
     AddRequiredExtensions(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME);
+    AddRequiredExtensions(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME);
     AddRequiredFeature(vkt::Feature::descriptorBuffer);
+    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(Init(nullptr, nullptr, instance_pnext));
+
+    GetPhysicalDeviceProperties2(descriptor_buffer_properties);
 }
 
 class PositiveDescriptorBuffer : public DescriptorBufferTest {};
 
 TEST_F(PositiveDescriptorBuffer, BasicUsage) {
     TEST_DESCRIPTION("Create VkBuffer with extension.");
-    RETURN_IF_SKIP(InitBasicDescriptorBuffer());
+    SetTargetApiVersion(VK_API_VERSION_1_2);
+    AddRequiredExtensions(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME);
+    AddRequiredFeature(vkt::Feature::descriptorBuffer);
+    RETURN_IF_SKIP(Init());
 
     // *descriptorBufferAddressSpaceSize properties are guaranteed to be 2^27
     VkBufferCreateInfo buffer_ci = vku::InitStructHelper();
@@ -48,8 +55,6 @@ TEST_F(PositiveDescriptorBuffer, BasicUsage) {
 
 TEST_F(PositiveDescriptorBuffer, BindBufferAndSetOffset) {
     TEST_DESCRIPTION("Bind descriptor buffer and set descriptor offset then draw.");
-    AddRequiredExtensions(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME);
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
     InitRenderTarget();
 
@@ -83,8 +88,6 @@ TEST_F(PositiveDescriptorBuffer, BindBufferAndSetOffset) {
 
 TEST_F(PositiveDescriptorBuffer, UnusedBoundBuffer) {
     TEST_DESCRIPTION("https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/10290");
-    AddRequiredExtensions(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME);
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
     InitRenderTarget();
 
@@ -126,10 +129,8 @@ TEST_F(PositiveDescriptorBuffer, UnusedBoundBuffer) {
 
 TEST_F(PositiveDescriptorBuffer, PipelineFlags2) {
     TEST_DESCRIPTION("Use descriptor buffer with pipeline created with VkPipelineCreateFlags2CreateInfo");
-    AddRequiredExtensions(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME);
     AddRequiredExtensions(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
     AddRequiredFeature(vkt::Feature::maintenance5);
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
     InitRenderTarget();
 
@@ -164,12 +165,8 @@ TEST_F(PositiveDescriptorBuffer, PipelineFlags2) {
 }
 
 TEST_F(PositiveDescriptorBuffer, BindingMidBuffer) {
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
 
-    VkPhysicalDeviceDescriptorBufferPropertiesEXT descriptor_buffer_properties = vku::InitStructHelper();
-    GetPhysicalDeviceProperties2(descriptor_buffer_properties);
-
     m_command_buffer.Begin();
 
     vkt::Buffer buffer(*m_device, 4096, VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT, vkt::device_address);
@@ -183,12 +180,8 @@ TEST_F(PositiveDescriptorBuffer, BindingMidBuffer) {
 
 TEST_F(PositiveDescriptorBuffer, Basic) {
     TEST_DESCRIPTION("Tries to use a full workflow.");
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
 
-    VkPhysicalDeviceDescriptorBufferPropertiesEXT descriptor_buffer_properties = vku::InitStructHelper();
-    GetPhysicalDeviceProperties2(descriptor_buffer_properties);
-
     vkt::Buffer buffer_data(*m_device, 16, 0, vkt::device_address);
     uint32_t *data = (uint32_t *)buffer_data.Memory().Map();
     data[0] = 8;
@@ -197,15 +190,9 @@ TEST_F(PositiveDescriptorBuffer, Basic) {
 
     VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr};
     vkt::DescriptorSetLayout ds_layout(*m_device, binding, VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT);
+    vkt::PipelineLayout pipeline_layout(*m_device, {&ds_layout});
 
-    VkPipelineLayoutCreateInfo pipe_layout_ci = vku::InitStructHelper();
-    pipe_layout_ci.setLayoutCount = 1;
-    pipe_layout_ci.pSetLayouts = &ds_layout.handle();
-    vkt::PipelineLayout pipeline_layout(*m_device, pipe_layout_ci);
-
-    VkDeviceSize ds_layout_size = 0;
-    vk::GetDescriptorSetLayoutSizeEXT(device(), ds_layout, &ds_layout_size);
-
+    VkDeviceSize ds_layout_size = ds_layout.GetDescriptorBufferSize();
     vkt::Buffer descriptor_buffer(*m_device, ds_layout_size, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
                                   vkt::device_address);
 
@@ -267,12 +254,8 @@ TEST_F(PositiveDescriptorBuffer, Basic) {
 
 TEST_F(PositiveDescriptorBuffer, MultipleSet) {
     TEST_DESCRIPTION("Have a single VkBuffer of data spread across 3 different sets.");
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
 
-    VkPhysicalDeviceDescriptorBufferPropertiesEXT descriptor_buffer_properties = vku::InitStructHelper();
-    GetPhysicalDeviceProperties2(descriptor_buffer_properties);
-
     vkt::Buffer buffer_data(*m_device, 16, 0, vkt::device_address);
     uint32_t *data = (uint32_t *)buffer_data.Memory().Map();
     data[0] = 8;
@@ -281,16 +264,9 @@ TEST_F(PositiveDescriptorBuffer, MultipleSet) {
 
     VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr};
     vkt::DescriptorSetLayout ds_layout(*m_device, binding, VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT);
+    vkt::PipelineLayout pipeline_layout(*m_device, {&ds_layout, &ds_layout, &ds_layout});
 
-    const VkDescriptorSetLayout set_layouts[3] = {ds_layout, ds_layout, ds_layout};
-    VkPipelineLayoutCreateInfo pipe_layout_ci = vku::InitStructHelper();
-    pipe_layout_ci.setLayoutCount = 3;
-    pipe_layout_ci.pSetLayouts = set_layouts;
-    vkt::PipelineLayout pipeline_layout(*m_device, pipe_layout_ci);
-
-    VkDeviceSize ds_layout_size = 0;
-    vk::GetDescriptorSetLayoutSizeEXT(device(), ds_layout, &ds_layout_size);
-
+    VkDeviceSize ds_layout_size = ds_layout.GetDescriptorBufferSize();
     vkt::Buffer descriptor_buffer(*m_device, ds_layout_size * 3, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
                                   vkt::device_address);
 
@@ -378,12 +354,8 @@ TEST_F(PositiveDescriptorBuffer, MultipleSet) {
 
 TEST_F(PositiveDescriptorBuffer, MultipleBinding) {
     TEST_DESCRIPTION("Have a single VkBuffer of data spread across 3 different bindings in the same set.");
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
 
-    VkPhysicalDeviceDescriptorBufferPropertiesEXT descriptor_buffer_properties = vku::InitStructHelper();
-    GetPhysicalDeviceProperties2(descriptor_buffer_properties);
-
     vkt::Buffer buffer_data(*m_device, 16, 0, vkt::device_address);
     uint32_t *data = (uint32_t *)buffer_data.Memory().Map();
     data[0] = 8;
@@ -394,20 +366,9 @@ TEST_F(PositiveDescriptorBuffer, MultipleBinding) {
                                                           {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr},
                                                           {2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}};
     vkt::DescriptorSetLayout ds_layout(*m_device, bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT);
+    vkt::PipelineLayout pipeline_layout(*m_device, {&ds_layout});
 
-    VkPipelineLayoutCreateInfo pipe_layout_ci = vku::InitStructHelper();
-    pipe_layout_ci.setLayoutCount = 1;
-    pipe_layout_ci.pSetLayouts = &ds_layout.handle();
-    vkt::PipelineLayout pipeline_layout(*m_device, pipe_layout_ci);
-
-    VkDeviceSize ds_layout_size = 0;
-    vk::GetDescriptorSetLayoutSizeEXT(device(), ds_layout, &ds_layout_size);
-
-    VkDeviceSize ds_layout_binding_offsets[3];
-    vk::GetDescriptorSetLayoutBindingOffsetEXT(device(), ds_layout, 0, &ds_layout_binding_offsets[0]);
-    vk::GetDescriptorSetLayoutBindingOffsetEXT(device(), ds_layout, 1, &ds_layout_binding_offsets[1]);
-    vk::GetDescriptorSetLayoutBindingOffsetEXT(device(), ds_layout, 2, &ds_layout_binding_offsets[2]);
-
+    VkDeviceSize ds_layout_size = ds_layout.GetDescriptorBufferSize();
     vkt::Buffer descriptor_buffer(*m_device, ds_layout_size, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
                                   vkt::device_address);
 
@@ -427,13 +388,15 @@ TEST_F(PositiveDescriptorBuffer, MultipleBinding) {
 
     // Sets data_buffer[1] to binding 1
     addr_info.address += 4;
+    VkDeviceSize ds_layout_binding_offset = ds_layout.GetDescriptorBufferBindingOffset(1);
     vk::GetDescriptorEXT(device(), &buffer_descriptor_info, descriptor_buffer_properties.storageBufferDescriptorSize,
-                         mapped_descriptor_data + ds_layout_binding_offsets[1]);
+                         mapped_descriptor_data + ds_layout_binding_offset);
 
     // Sets data_buffer[2] to binding 2
     addr_info.address += 4;
+    ds_layout_binding_offset = ds_layout.GetDescriptorBufferBindingOffset(2);
     vk::GetDescriptorEXT(device(), &buffer_descriptor_info, descriptor_buffer_properties.storageBufferDescriptorSize,
-                         mapped_descriptor_data + ds_layout_binding_offsets[2]);
+                         mapped_descriptor_data + ds_layout_binding_offset);
 
     char const *cs_source = R"glsl(
         #version 450
@@ -487,7 +450,6 @@ TEST_F(PositiveDescriptorBuffer, BindingInfoUsage2) {
     TEST_DESCRIPTION("https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/9228");
     AddRequiredExtensions(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
     AddRequiredFeature(vkt::Feature::maintenance5);
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
 
     VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper();
@@ -515,7 +477,6 @@ TEST_F(PositiveDescriptorBuffer, DescriptorBufferBindingInfoUsage2) {
     TEST_DESCRIPTION("https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/9228");
     AddRequiredExtensions(VK_KHR_MAINTENANCE_5_EXTENSION_NAME);
     AddRequiredFeature(vkt::Feature::maintenance5);
-    AddRequiredFeature(vkt::Feature::bufferDeviceAddress);
     RETURN_IF_SKIP(InitBasicDescriptorBuffer());
 
     vkt::Buffer buffer(*m_device, 4096, VK_BUFFER_USAGE_SAMPLER_DESCRIPTOR_BUFFER_BIT_EXT, vkt::device_address);
@@ -530,3 +491,92 @@ TEST_F(PositiveDescriptorBuffer, DescriptorBufferBindingInfoUsage2) {
     vk::CmdBindDescriptorBuffersEXT(m_command_buffer, 1, &dbbi);
     m_command_buffer.End();
 }
+
+TEST_F(PositiveDescriptorBuffer, TexelBuffer) {
+    RETURN_IF_SKIP(InitBasicDescriptorBuffer());
+
+    vkt::Buffer stroage_buffer(*m_device, 32, VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT, vkt::device_address);
+    vkt::BufferView stroage_buffer_view(*m_device, stroage_buffer, VK_FORMAT_R32_UINT);
+    vkt::Buffer uniform_buffer(*m_device, 32, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT, vkt::device_address);
+    vkt::BufferView uniform_buffer_view(*m_device, uniform_buffer, VK_FORMAT_R32_UINT);
+
+    uint32_t *data = (uint32_t *)uniform_buffer.Memory().Map();
+    data[0] = 8;
+    data[1] = 12;
+    data[2] = 1;
+    data[3] = 4;
+
+    std::vector<VkDescriptorSetLayoutBinding> bindings = {
+        {0, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr},
+        {1, VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}};
+    vkt::DescriptorSetLayout ds_layout(*m_device, bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT);
+    vkt::PipelineLayout pipeline_layout(*m_device, {&ds_layout});
+
+    VkDeviceSize ds_layout_size = ds_layout.GetDescriptorBufferSize();
+    vkt::Buffer descriptor_buffer(*m_device, ds_layout_size, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,
+                                  vkt::device_address);
+
+    VkDescriptorAddressInfoEXT addr_info = vku::InitStructHelper();
+    addr_info.address = stroage_buffer.Address();
+    addr_info.range = 32;
+    addr_info.format = VK_FORMAT_R32_UINT;
+
+    VkDescriptorGetInfoEXT buffer_descriptor_info = vku::InitStructHelper();
+    buffer_descriptor_info.type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER;
+    buffer_descriptor_info.data.pStorageTexelBuffer = &addr_info;
+
+    uint8_t *mapped_descriptor_data = (uint8_t *)descriptor_buffer.Memory().Map();
+    vk::GetDescriptorEXT(device(), &buffer_descriptor_info, descriptor_buffer_properties.storageTexelBufferDescriptorSize,
+                         mapped_descriptor_data);
+
+    addr_info.address = uniform_buffer.Address();
+    buffer_descriptor_info.type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER;
+    buffer_descriptor_info.data.pUniformTexelBuffer = &addr_info;
+    VkDeviceSize ds_layout_binding_offset = ds_layout.GetDescriptorBufferBindingOffset(1);
+    vk::GetDescriptorEXT(device(), &buffer_descriptor_info, descriptor_buffer_properties.storageTexelBufferDescriptorSize,
+                         mapped_descriptor_data + ds_layout_binding_offset);
+
+    char const *cs_source = R"glsl(
+        #version 450
+        layout(set = 0, binding = 0, r32ui) uniform uimageBuffer s_buffer;
+        layout(set = 0, binding = 1) uniform usamplerBuffer u_buffer;
+
+        void main() {
+            imageStore(s_buffer, 0, texelFetch(u_buffer, 0));
+            imageStore(s_buffer, 1, texelFetch(u_buffer, 1));
+            imageStore(s_buffer, 2, texelFetch(u_buffer, 2));
+            imageStore(s_buffer, 3, texelFetch(u_buffer, 3));
+        }
+    )glsl";
+
+    CreateComputePipelineHelper pipe(*this);
+    pipe.cs_ = VkShaderObj(this, cs_source, VK_SHADER_STAGE_COMPUTE_BIT, SPV_ENV_VULKAN_1_2);
+    pipe.cp_ci_.flags |= VK_PIPELINE_CREATE_DESCRIPTOR_BUFFER_BIT_EXT;
+    pipe.cp_ci_.layout = pipeline_layout;
+    pipe.CreateComputePipeline();
+
+    m_command_buffer.Begin();
+    vk::CmdBindPipeline(m_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipe);
+
+    VkDescriptorBufferBindingInfoEXT descriptor_buffer_binding_info = vku::InitStructHelper();
+    descriptor_buffer_binding_info.address = descriptor_buffer.Address();
+    descriptor_buffer_binding_info.usage = VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT;
+    vk::CmdBindDescriptorBuffersEXT(m_command_buffer, 1, &descriptor_buffer_binding_info);
+
+    uint32_t buffer_index = 0;
+    VkDeviceSize buffer_offset = 0;
+    vk::CmdSetDescriptorBufferOffsetsEXT(m_command_buffer, VK_PIPELINE_BIND_POINT_COMPUTE, pipeline_layout, 0, 1, &buffer_index,
+                                         &buffer_offset);
+    vk::CmdDispatch(m_command_buffer, 1, 1, 1);
+    m_command_buffer.End();
+
+    m_default_queue->SubmitAndWait(m_command_buffer);
+
+    data = (uint32_t *)stroage_buffer.Memory().Map();
+    if (!IsPlatformMockICD()) {
+        ASSERT_TRUE(data[0] == 8);
+        ASSERT_TRUE(data[1] == 12);
+        ASSERT_TRUE(data[2] == 1);
+        ASSERT_TRUE(data[3] == 4);
+    }
+}

tests/unit/descriptor_buffer_positive.cpp

@@ -41,9 +41,7 @@ TEST_F(PositiveGpuAVDescriptorBuffer, Basic) {
     pipe_layout_ci.pSetLayouts = &ds_layout.handle();
     vkt::PipelineLayout pipeline_layout(*m_device, pipe_layout_ci);
 
-    VkDeviceSize ds_layout_size = 0;
-    vk::GetDescriptorSetLayoutSizeEXT(device(), ds_layout, &ds_layout_size);
-
+    VkDeviceSize ds_layout_size = ds_layout.GetDescriptorBufferSize();
     ds_layout_size = Align(ds_layout_size, descriptor_buffer_properties.descriptorBufferOffsetAlignment);
 
     vkt::Buffer descriptor_buffer(*m_device, ds_layout_size, VK_BUFFER_USAGE_RESOURCE_DESCRIPTOR_BUFFER_BIT_EXT,