commit f4aed6c620084a7748e9d7be3897ae736f03d165
author Chia-I Wu <olv@lunarg.com> Fri Jul 03 13:44:34 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:18 2015 -0600
tree 14ddee74704bd7096e1448ea430a37c3c4aa4c24
parent 78c2a35016c72b92ce5d6fd705deb31736162607

test/binding: inherit Buffer and Image from NonDispHandle

Remove support for vkQueueBindSparseBufferMemory() and
vkQueueBindSparseImageMemory().

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 07356a5..1b8315b 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -265,7 +265,7 @@
     ASSERT_VK_SUCCESS( err );
 
     char *ptr;
-    ptr = (char *) displayImage.map();
+    ptr = (char *) displayImage.MapMemory();
     ptr += sr_layout.offset;
     ofstream file (filename.c_str(), ios::binary);
     ASSERT_TRUE(file.is_open()) << "Unable to open file: " << filename;
@@ -303,7 +303,7 @@
     }
 
     file.close();
-    displayImage.unmap();
+    displayImage.UnmapMemory();
 }
 
 void VkTestFramework::Compare(const char *basename, VkImageObj *image )
@@ -379,7 +379,7 @@
     err = vkGetImageSubresourceLayout(displayImage.device()->device(), displayImage.image(), &sr, &sr_layout);
     ASSERT_VK_SUCCESS( err );
 
-    err = displayImage.MapMemory( (void **) &ptr );
+    ptr = (char *) displayImage.MapMemory();
     ASSERT_VK_SUCCESS( err );
 
     ptr += sr_layout.offset;
@@ -394,8 +394,7 @@
     m_images.push_back(record);
     m_display_image = --m_images.end();
 
-    err = displayImage.UnmapMemory();
-    ASSERT_VK_SUCCESS( err );
+    displayImage.UnmapMemory();
 }
 
 void VkTestFramework::RecordImages(vector<VkImageObj *> images)
@@ -463,9 +462,9 @@
 
     VkMemoryPropertyFlags flags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
     buf.init_as_src(m_device, (VkDeviceSize)m_display_image->m_data_size, flags);
-    dest_ptr = buf.map();
+    dest_ptr = buf.memory().map();
     memcpy(dest_ptr, m_display_image->m_data, m_display_image->m_data_size);
-    buf.unmap();
+    buf.memory().unmap();
 
     m_cmdbuf.begin();
 
@@ -475,7 +474,7 @@
     region.imageExtent.depth = 1;
 
     vkCmdCopyBufferToImage(m_cmdbuf.handle(),
-        buf.obj(),
+        buf.handle(),
         m_persistent_images[m_current_buffer].image, VK_IMAGE_LAYOUT_TRANSFER_DESTINATION_OPTIMAL,
         1, &region);
     m_cmdbuf.end();