commit f5fb1092e95a6d5d38ef65c4f9504e7ea4f9ce59
author Chia-I Wu <olv@lunarg.com> Fri Jul 03 10:32:05 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Jul 17 10:05:17 2015 -0600
tree c7cdc86d0ff6f0f8b612914954e7c01dfee89ed3
parent a10be9d8a28a559a0de069fc590d550a0c101430

test/binding: inherit PhysicalGpu from Handle

And rename PhysicalGpu to PhysicalDevice, gpu to phy.

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index 9c70b98..8d71265 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -122,9 +122,9 @@
         this->m_device = new vk_testing::Device(objs[m_device_id]);
         this->m_device->init();
 
-        props = m_device->gpu().properties();
+        props = m_device->phy().properties();
 
-        queue_props = this->m_device->gpu().queue_properties();
+        queue_props = this->m_device->phy().queue_properties();
         for (i = 0; i < queue_props.size(); i++) {
             if (queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
                 graphics_queue_node_index = i;
@@ -201,7 +201,7 @@
         mem_info.allocationSize = mem_req.size;
         mem_info.memoryTypeIndex = 0;
 
-        err = m_device->gpu().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        err = m_device->phy().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
         ASSERT_VK_SUCCESS(err);
 
         err = vkAllocMemory(device(), &mem_info, &event_mem);
@@ -294,7 +294,7 @@
         mem_info.allocationSize = mem_req.size * MAX_QUERY_SLOTS;
         mem_info.memoryTypeIndex = 0;
 
-        err = m_device->gpu().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        err = m_device->phy().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
         ASSERT_VK_SUCCESS(err);
 
         err = vkAllocMemory(device(), &mem_info, &query_mem);
@@ -340,7 +340,7 @@
     VkResult err;
     VkQueue queue;
 
-    const VkPhysicalDeviceQueueProperties props = device->gpu().queue_properties()[queue_node_index];
+    const VkPhysicalDeviceQueueProperties props = device->phy().queue_properties()[queue_node_index];
     for (que_idx = 0; que_idx < props.queueCount; que_idx++) {
         // TODO: Need to add support for separate MEMMGR and work queues, including synchronization
         err = vkGetDeviceQueue(device->obj(), queue_node_index, que_idx, &queue);
@@ -490,7 +490,7 @@
         mem_info.allocationSize = mem_req.size;
         mem_info.memoryTypeIndex = 0;
 
-        err = m_device->gpu().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
+        err = m_device->phy().set_memory_type(mem_req.memoryTypeBits, &mem_info, 0);
         ASSERT_VK_SUCCESS(err);
 
         err = vkAllocMemory(device(), &mem_info, &image_mem);