commit f68ad722614a6a228700d378bd18394ca53da642
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Apr 16 13:38:46 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Apr 16 14:26:00 2015 -0600
tree 41984d4e2551f6abe37d5072ad8a9f3d196e5065
parent 38ce2b18569a184a64add4e03ffb7f4b9673ba14

bug 13632: Convert commands to plural form

part of multiple commits to implement bug #13632.
bug 13632
header version 82
svn version: 30446

This patch converts:
vkCmdBindVertexBuffer -> vkCmdBindVertexBuffers
vkQueueAddMemReference -> vkQueueAddMemReferences
vkQueueRemoveMemReference -> vkQueueRemoveMemReferences

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 7e5aa68..42ed4fe 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -774,7 +774,7 @@
 
 void VkConstantBufferObj::Bind(VkCmdBuffer cmdBuffer, VkGpuSize offset, uint32_t binding)
 {
-    vkCmdBindVertexBuffer(cmdBuffer, obj(), offset, binding);
+    vkCmdBindVertexBuffers(cmdBuffer, binding, 1, &obj(), &offset);
 }
 
 
@@ -1135,16 +1135,12 @@
 
 void VkMemoryRefManager::EmitAddMemoryRefs(VkQueue queue)
 {
-    for (uint32_t i = 0; i < mem_refs_.size(); i++) {
-        vkQueueAddMemReference(queue, mem_refs_[i]);
-    }
+    vkQueueAddMemReferences(queue, mem_refs_.size(), &mem_refs_[0]);
 }
 
 void VkMemoryRefManager::EmitRemoveMemoryRefs(VkQueue queue)
 {
-    for (uint32_t i = 0; i < mem_refs_.size(); i++) {
-        vkQueueRemoveMemReference(queue, mem_refs_[i]);
-    }
+    vkQueueRemoveMemReferences(queue, mem_refs_.size(), &mem_refs_[0]);
 }
 
 VkCommandBufferObj::VkCommandBufferObj(VkDeviceObj *device)
@@ -1411,9 +1407,9 @@
     mem_ref_mgr.AddMemoryRefs(*indexBuffer);
 }
 
-void VkCommandBufferObj::BindVertexBuffer(VkConstantBufferObj *vertexBuffer, uint32_t offset, uint32_t binding)
+void VkCommandBufferObj::BindVertexBuffer(VkConstantBufferObj *vertexBuffer, VkGpuSize offset, uint32_t binding)
 {
-    vkCmdBindVertexBuffer(obj(), vertexBuffer->obj(), offset, binding);
+    vkCmdBindVertexBuffers(obj(), binding, 1, &vertexBuffer->obj(), &offset);
     mem_ref_mgr.AddMemoryRefs(*vertexBuffer);
 }
 

tests/vkrenderframework.h

diff --git a/tests/vkrenderframework.h b/tests/vkrenderframework.h
index 7cb3e17..0c2777b 100644
--- a/tests/vkrenderframework.h
+++ b/tests/vkrenderframework.h
@@ -167,7 +167,7 @@
     void AddMemoryRefs(vector<vk_testing::Object *> images);
     void BindPipeline(VkPipelineObj &pipeline);
     void BindDescriptorSet(VkDescriptorSetObj &descriptorSet);
-    void BindVertexBuffer(VkConstantBufferObj *vertexBuffer, uint32_t offset, uint32_t binding);
+    void BindVertexBuffer(VkConstantBufferObj *vertexBuffer, VkGpuSize offset, uint32_t binding);
     void BindIndexBuffer(VkIndexBufferObj *indexBuffer, uint32_t offset);
     void BindStateObject(VkStateBindPoint stateBindPoint, VkDynamicStateObject stateObject);
     void BeginRenderPass(VkRenderPass renderpass, VkFramebuffer framebuffer);

tests/vktestbinding.cpp

diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 1287e7a..d9cdc9b 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -499,16 +499,12 @@
 
 void Queue::add_mem_references(const std::vector<VkGpuMemory> &mem_refs)
 {
-    for (int i = 0; i < mem_refs.size(); i++) {
-        EXPECT(vkQueueAddMemReference(obj(), mem_refs[i]) == VK_SUCCESS);
-    }
+    EXPECT(vkQueueAddMemReferences(obj(), mem_refs.size(), &mem_refs[0]) == VK_SUCCESS);
 }
 
 void Queue::remove_mem_references(const std::vector<VkGpuMemory> &mem_refs)
 {
-    for (int i = 0; i < mem_refs.size(); i++) {
-        EXPECT(vkQueueRemoveMemReference(obj(), mem_refs[i]) == VK_SUCCESS);
-    }
+    EXPECT(vkQueueRemoveMemReferences(obj(), mem_refs.size(), &mem_refs[0]) == VK_SUCCESS);
 }
 
 void Queue::wait()

tests/vktestbinding.h

diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 75bc433..18de306 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -137,7 +137,7 @@
 
     // Unless an object is initialized with init_no_mem(), memories are
     // automatically allocated and bound.  These methods can be used to get
-    // the memories (for vkQueueAddMemReference), or to map/unmap the primary memory.
+    // the memories (for vkQueueAddMemReferences), or to map/unmap the primary memory.
     std::vector<VkGpuMemory> memories() const;
 
     const void *map(VkFlags flags) const;
@@ -259,8 +259,8 @@
     void submit(const CmdBuffer &cmd, Fence &fence);
     void submit(const CmdBuffer &cmd);
 
-    // vkQueueAddMemReference()
-    // vkQueueRemoveMemReference()
+    // vkQueueAddMemReferences()
+    // vkQueueRemoveMemReferences()
     void add_mem_references(const std::vector<VkGpuMemory> &mem_refs);
     void remove_mem_references(const std::vector<VkGpuMemory> &mem_refs);
 

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 1912bb7..de59fd4 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -523,8 +523,8 @@
                 1, &region);
         m_cmdbuf.end();
 
-        vkQueueAddMemReference(m_queue.obj(), m_display_image->m_presentableMemory);
-        vkQueueAddMemReference(m_queue.obj(), buf.memories()[0]);
+        vkQueueAddMemReferences(m_queue.obj(), 1, &m_display_image->m_presentableMemory);
+        vkQueueAddMemReferences(m_queue.obj(), buf.memories().size(), &buf.memories()[0]);
 
         VkCmdBuffer cmdBufs[1];
         cmdBufs[0] = m_cmdbuf.obj();
@@ -532,8 +532,8 @@
         vkQueueSubmit(m_queue.obj(), 1, cmdBufs, NULL);
         m_queue.wait();
 
-        vkQueueRemoveMemReference(m_queue.obj(), m_display_image->m_presentableMemory);
-        vkQueueRemoveMemReference(m_queue.obj(), buf.memories()[0]);
+        vkQueueRemoveMemReferences(m_queue.obj(), 1, &m_display_image->m_presentableMemory);
+        vkQueueRemoveMemReferences(m_queue.obj(), buf.memories().size(), &buf.memories()[0]);
 
         if (m_display_image->m_width > m_width)
             m_width = m_display_image->m_width;