Revert "test: GH422 - Buffer Validation Tests"
Inadvertently pushed to Master.
This reverts commit 532058edb9cfeefc0aa49f3c4067e6f712dd0241.
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index edd8cf3..1723655 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1237,12 +1237,13 @@
}
void VkPipelineObj::AddVertexInputAttribs(
- VkVertexInputAttributeDescription *vi_attrib, unsigned count) {
+ VkVertexInputAttributeDescription *vi_attrib, int count) {
m_vi_state.pVertexAttributeDescriptions = vi_attrib;
m_vi_state.vertexAttributeDescriptionCount = count;
}
-void VkPipelineObj::AddVertexInputBindings(VkVertexInputBindingDescription *vi_binding, unsigned count) {
+void VkPipelineObj::AddVertexInputBindings(
+ VkVertexInputBindingDescription *vi_binding, int count) {
m_vi_state.pVertexBindingDescriptions = vi_binding;
m_vi_state.vertexBindingDescriptionCount = count;
}
@@ -1639,12 +1640,12 @@
vkCmdDraw(handle(), vertexCount, instanceCount, firstVertex, firstInstance);
}
-void VkCommandBufferObj::QueueCommandBuffer(bool checkSuccess) {
+void VkCommandBufferObj::QueueCommandBuffer() {
VkFence nullFence = {VK_NULL_HANDLE};
- QueueCommandBuffer(nullFence, checkSuccess);
+ QueueCommandBuffer(nullFence);
}
-void VkCommandBufferObj::QueueCommandBuffer(VkFence fence, bool checkSuccess) {
+void VkCommandBufferObj::QueueCommandBuffer(VkFence fence) {
VkResult err = VK_SUCCESS;
// submit the command buffer to the universal queue
@@ -1660,14 +1661,10 @@
submit_info.pSignalSemaphores = NULL;
err = vkQueueSubmit(m_device->m_queue, 1, &submit_info, fence);
- if (checkSuccess) {
- ASSERT_VK_SUCCESS(err);
- }
+ ASSERT_VK_SUCCESS(err);
err = vkQueueWaitIdle(m_device->m_queue);
- if (checkSuccess) {
- ASSERT_VK_SUCCESS(err);
- }
+ ASSERT_VK_SUCCESS(err);
// Wait for work to finish before cleaning up.
vkDeviceWaitIdle(m_device->device());
@@ -1742,5 +1739,3 @@
m_attachmentBindInfo = m_imageView.handle();
}
-
-unsigned cVertices::BindIdGenerator;