layers: Add Missing vkCmdDrawIndirectByteCount2EXT

Author: spencer-lunarg

layers/gpuav/core/gpuav.h

@@ -151,6 +151,11 @@ class Validator : public GpuShaderInstrumentor {
                                                       const RecordObject& record_obj) final;
     void PreCallRecordCmdDrawMeshTasksIndirectCount2EXT(VkCommandBuffer commandBuffer, const VkDrawIndirectCount2InfoKHR* pInfo,
                                                         const RecordObject& record_obj) final;
+    void PreCallRecordCmdDrawIndirectByteCount(VkCommandBuffer commandBuffer, const RecordObject& record_obj);
+    void PreCallRecordCmdDrawIndirectByteCount2EXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance,
+                                                   const VkBindTransformFeedbackBuffer2InfoEXT* pCounterInfo,
+                                                   uint32_t counterOffset, uint32_t vertexStride,
+                                                   const RecordObject& record_obj) final;
     void PreCallRecordCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance,
                                                   VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset,
                                                   uint32_t vertexStride, const RecordObject& record_obj) final;

layers/gpuav/core/gpuav_record.cpp

@@ -604,17 +604,28 @@ void Validator::PreCallRecordCmdDrawMeshTasksIndirectCount2EXT(VkCommandBuffer c
     PreCallRecordCmdDrawIndirectCount2KHR(commandBuffer, pInfo, record_obj);
 }
 
-void Validator::PreCallRecordCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount,
-                                                         uint32_t firstInstance, VkBuffer counterBuffer,
-                                                         VkDeviceSize counterBufferOffset, uint32_t counterOffset,
-                                                         uint32_t vertexStride, const RecordObject& record_obj) {
+void Validator::PreCallRecordCmdDrawIndirectByteCount(VkCommandBuffer commandBuffer, const RecordObject& record_obj) {
     auto cb_state = GetWrite<vvl::CommandBuffer>(commandBuffer);
-
     auto& sub_state = SubState(*cb_state);
     const LastBound& last_bound = cb_state->GetLastBoundGraphics();
     PreCallActionCommand(*this, sub_state, last_bound, record_obj.location);
 }
 
+void Validator::PreCallRecordCmdDrawIndirectByteCount2EXT(VkCommandBuffer commandBuffer, uint32_t instanceCount,
+                                                          uint32_t firstInstance,
+                                                          const VkBindTransformFeedbackBuffer2InfoEXT* pCounterInfo,
+                                                          uint32_t counterOffset, uint32_t vertexStride,
+                                                          const RecordObject& record_obj) {
+    PreCallRecordCmdDrawIndirectByteCount(commandBuffer, record_obj);
+}
+
+void Validator::PreCallRecordCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount,
+                                                         uint32_t firstInstance, VkBuffer counterBuffer,
+                                                         VkDeviceSize counterBufferOffset, uint32_t counterOffset,
+                                                         uint32_t vertexStride, const RecordObject& record_obj) {
+    PreCallRecordCmdDrawIndirectByteCount(commandBuffer, record_obj);
+}
+
 void Validator::PreCallRecordCmdDrawIndexedIndirectCountKHR(VkCommandBuffer commandBuffer, VkBuffer buffer, VkDeviceSize offset,
                                                             VkBuffer countBuffer, VkDeviceSize countBufferOffset,
                                                             uint32_t maxDrawCount, uint32_t stride,

layers/state_tracker/state_tracker.cpp

@@ -3828,11 +3828,19 @@ void DeviceState::PostCallRecordCmdDrawIndirectByteCount2EXT(VkCommandBuffer com
                                                              uint32_t counterOffset, uint32_t vertexStride,
                                                              const RecordObject& record_obj) {
     auto cb_state = GetWrite<CommandBuffer>(commandBuffer);
-    cb_state->RecordCommand(record_obj.location);
+    cb_state->RecordDraw(record_obj.location);
     TrackDeviceAddressRange(*cb_state, pCounterInfo->addressRange.address, pCounterInfo->addressRange.size,
                             VK_BUFFER_USAGE_2_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT);
 }
 
+void DeviceState::PostCallRecordCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount,
+                                                            uint32_t firstInstance, VkBuffer counterBuffer,
+                                                            VkDeviceSize counterBufferOffset, uint32_t counterOffset,
+                                                            uint32_t vertexStride, const RecordObject& record_obj) {
+    auto cb_state = GetWrite<CommandBuffer>(commandBuffer);
+    cb_state->RecordDraw(record_obj.location);
+}
+
 void DeviceState::PostCallRecordCmdWriteMarkerToMemoryAMD(VkCommandBuffer commandBuffer, const VkMemoryMarkerInfoAMD* pInfo,
                                                           const RecordObject& record_obj) {
     auto cb_state = GetWrite<CommandBuffer>(commandBuffer);

layers/state_tracker/state_tracker.h

@@ -1347,6 +1347,9 @@ class DeviceState : public vvl::BaseDevice {
                                                     const VkBindTransformFeedbackBuffer2InfoEXT* pCounterInfo,
                                                     uint32_t counterOffset, uint32_t vertexStride,
                                                     const RecordObject& record_obj) override;
+    void PostCallRecordCmdDrawIndirectByteCountEXT(VkCommandBuffer commandBuffer, uint32_t instanceCount, uint32_t firstInstance,
+                                                   VkBuffer counterBuffer, VkDeviceSize counterBufferOffset, uint32_t counterOffset,
+                                                   uint32_t vertexStride, const RecordObject& record_obj) override;
     void PostCallRecordCmdWriteMarkerToMemoryAMD(VkCommandBuffer commandBuffer, const VkMemoryMarkerInfoAMD* pInfo,
                                                  const RecordObject& record_obj) override;
     void PostCallRecordCmdBeginConditionalRenderingEXT(VkCommandBuffer commandBuffer,