tests: Misc fixes

Author: spencer-lunarg

layers/gpu_dump/gpu_dump_descriptor_buffer.cpp

@@ -202,7 +202,8 @@ bool CommandBufferSubState::DumpDescriptorBuffer(std::ostringstream& ss, const L
 
     vvl::unordered_map<uint32_t, VkBufferUsageFlagBits2> binding_usage_flags;
     uint32_t binding_info_count = (uint32_t)cb_state.descriptor_buffer.binding_info.size();
-    if (dev_data.enabled[gpu_validation] && dev_data.gpuav_settings.IsShaderInstrumentationEnabled()) {
+    // Can be zero if using only push constants
+    if (dev_data.enabled[gpu_validation] && dev_data.gpuav_settings.IsShaderInstrumentationEnabled() && binding_info_count != 0) {
         // We warn the users to not have both enabled, but if this occurs GPU-AV currently adds a buffer
         // but it is not tracked in any state tracking. (nor are the instrumented variables)
         // We just ignore the last binding

layers/gpuav/spirv/descriptor_heap_pass.cpp

@@ -155,7 +155,7 @@ uint32_t DescriptorHeapPass::GetMapping(const AccessPath& access_path, bool is_s
         }
     }
 
-    assert(false);
+    assert(false);  // caught by things like VU 11292
     return kMappingIndexInvalid;
 }
 

tests/unit/debug_printf.cpp

@@ -3955,9 +3955,9 @@ TEST_F(NegativeDebugPrintf, DrawIndexedIndirect) {
     auto indirect_command = static_cast<VkDrawIndexedIndirectCommand*>(indirect_buffer.Memory().Map());
     indirect_command->indexCount = 3;
     indirect_command->instanceCount = 1;
-    indirect_command->firstIndex = 1;
-    indirect_command->vertexOffset = 1;
-    indirect_command->firstInstance = 1;
+    indirect_command->firstIndex = 0;
+    indirect_command->vertexOffset = 0;
+    indirect_command->firstInstance = 0;
 
     m_command_buffer.Begin();
     m_command_buffer.BeginRenderPass(m_renderPassBeginInfo);
@@ -4002,9 +4002,9 @@ TEST_F(NegativeDebugPrintf, DrawIndirectCount) {
     auto indirect_command = static_cast<VkDrawIndexedIndirectCommand*>(indirect_buffer.Memory().Map());
     indirect_command->indexCount = 3;
     indirect_command->instanceCount = 1;
-    indirect_command->firstIndex = 1;
-    indirect_command->vertexOffset = 1;
-    indirect_command->firstInstance = 1;
+    indirect_command->firstIndex = 0;
+    indirect_command->vertexOffset = 0;
+    indirect_command->firstInstance = 0;
 
     vkt::Buffer count_buffer(*m_device, sizeof(uint32_t), VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT, kHostVisibleMemProps);
     uint32_t* count_ptr = static_cast<uint32_t*>(count_buffer.Memory().Map());
@@ -4054,9 +4054,9 @@ TEST_F(NegativeDebugPrintf, DrawIndexedIndirectCount) {
     auto indirect_command = static_cast<VkDrawIndexedIndirectCommand*>(indirect_buffer.Memory().Map());
     indirect_command->indexCount = 3;
     indirect_command->instanceCount = 1;
-    indirect_command->firstIndex = 1;
-    indirect_command->vertexOffset = 1;
-    indirect_command->firstInstance = 1;
+    indirect_command->firstIndex = 0;
+    indirect_command->vertexOffset = 0;
+    indirect_command->firstInstance = 0;
 
     vkt::Buffer count_buffer(*m_device, sizeof(uint32_t), VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT, kHostVisibleMemProps);
     uint32_t* count_ptr = static_cast<uint32_t*>(count_buffer.Memory().Map());

tests/unit/descriptor_heap.cpp

@@ -2080,6 +2080,7 @@ TEST_F(NegativeDescriptorHeap, DescriptorSetAndBindingMappingShaderObject) {
 
 TEST_F(NegativeDescriptorHeap, OpaqueCaptureDescriptorDataCreateInfo) {
     AddRequiredExtensions(VK_EXT_DESCRIPTOR_BUFFER_EXTENSION_NAME);
+    AddRequiredFeature(vkt::Feature::descriptorBuffer);
     RETURN_IF_SKIP(InitBasicDescriptorHeap());
 
     VkDescriptorSetAndBindingMappingEXT mapping = {};