bug 13038: Remove support for multiple GPUs
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=13038
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 3c2a8b6..b2a13ec 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -784,7 +784,7 @@
memset(&mem_info, 0, sizeof(mem_info));
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.allocationSize = mem_req.size;
- mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+ mem_info.memProps = 0;
err = vkAllocMemory(dev_.obj(), &mem_info, &event_mem);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index d9a6e27..7a6fbd5 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -227,7 +227,7 @@
ASSERT_NE(0, mem_req.size) << "vkGetObjectInfo (Image): Failed - expect images to require memory";
mem_info.allocationSize = mem_req.size;
- mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+ mem_info.memProps = 0;
/* allocate memory */
err = vkAllocMemory(device(), &mem_info, &m_image_mem);
diff --git a/tests/init.cpp b/tests/init.cpp
index 690aec8..f353fad 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -146,8 +146,7 @@
alloc_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
alloc_info.allocationSize = 1024 * 1024; // 1MB
- alloc_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT |
- VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
+ alloc_info.memProps = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
err = vkAllocMemory(device(), &alloc_info, &gpu_mem);
@@ -202,7 +201,7 @@
memset(&mem_info, 0, sizeof(mem_info));
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.allocationSize = mem_req.size;
- mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+ mem_info.memProps = 0;
err = vkAllocMemory(device(), &mem_info, &event_mem);
ASSERT_VK_SUCCESS(err);
@@ -294,7 +293,7 @@
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
// TODO: Is a simple multiple all that's needed here?
mem_info.allocationSize = mem_req.size * MAX_QUERY_SLOTS;
- mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+ mem_info.memProps = 0;
err = vkAllocMemory(device(), &mem_info, &query_mem);
ASSERT_VK_SUCCESS(err);
@@ -503,7 +502,7 @@
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.pNext = NULL;
mem_info.allocationSize = mem_req.size;
- mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+ mem_info.memProps = 0;
err = vkAllocMemory(device(), &mem_info, &image_mem);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index a93d8f9..932af68 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1769,7 +1769,7 @@
memset(&mem_info, 0, sizeof(mem_info));
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.allocationSize = mem_req.size;
- mem_info.memProps = VK_MEMORY_PROPERTY_SHAREABLE_BIT;
+ mem_info.memProps = 0;
err = vkAllocMemory(device(), &mem_info, &event_mem);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/test_common.h b/tests/test_common.h
index dae8d08..524e0b9 100644
--- a/tests/test_common.h
+++ b/tests/test_common.h
@@ -57,7 +57,6 @@
STR(VK_ERROR_BUILDING_COMMAND_BUFFER);
STR(VK_ERROR_MEMORY_NOT_BOUND);
STR(VK_ERROR_INCOMPATIBLE_QUEUE);
- STR(VK_ERROR_NOT_SHAREABLE);
#undef STR
default: return "UNKNOWN_RESULT";
}
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 00f8462..d0526c3 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -162,15 +162,6 @@
return exts;
}
-VkPhysicalDeviceCompatibilityInfo PhysicalGpu::compatibility(const PhysicalGpu &other) const
-{
- VkPhysicalDeviceCompatibilityInfo data;
- if (!EXPECT(vkGetMultiDeviceCompatibility(gpu_, other.gpu_, &data) == VK_SUCCESS))
- memset(&data, 0, sizeof(data));
-
- return data;
-}
-
void BaseObject::init(VkObject obj, VkObjectType type, bool own)
{
EXPECT(!initialized());
@@ -497,16 +488,6 @@
DERIVED_OBJECT_TYPE_INIT(vkAllocMemory, dev, VK_OBJECT_TYPE_DEVICE_MEMORY, &info);
}
-void GpuMemory::init(const Device &dev, const VkMemoryOpenInfo &info)
-{
- DERIVED_OBJECT_TYPE_INIT(vkOpenSharedMemory, dev, VK_OBJECT_TYPE_DEVICE_MEMORY, &info);
-}
-
-void GpuMemory::init(const Device &dev, const VkPeerMemoryOpenInfo &info)
-{
- DERIVED_OBJECT_TYPE_INIT(vkOpenPeerMemory, dev, VK_OBJECT_TYPE_DEVICE_MEMORY, &info);
-}
-
void GpuMemory::init(const Device &dev, VkDeviceMemory mem)
{
dev_ = &dev;
@@ -548,11 +529,6 @@
alloc_memory();
}
-void Semaphore::init(const Device &dev, const VkSemaphoreOpenInfo &info)
-{
- DERIVED_OBJECT_TYPE_INIT(vkOpenSharedSemaphore, dev, VK_OBJECT_TYPE_SEMAPHORE, &info);
-}
-
void Event::init(const Device &dev, const VkEventCreateInfo &info)
{
DERIVED_OBJECT_TYPE_INIT(vkCreateEvent, dev, VK_OBJECT_TYPE_EVENT, &info);
@@ -638,18 +614,6 @@
init_info(dev, info);
}
-void Image::init(const Device &dev, const VkPeerImageOpenInfo &info, const VkImageCreateInfo &original_info)
-{
- VkImage img;
- VkDeviceMemory mem;
- dev_ = &dev;
- EXPECT(vkOpenPeerImage(dev.obj(), &info, &img, &mem) == VK_SUCCESS);
- Object::init(img, VK_OBJECT_TYPE_IMAGE);
-
- init_info(dev, original_info);
- alloc_memory(std::vector<VkDeviceMemory>(1, mem));
-}
-
void Image::init_info(const Device &dev, const VkImageCreateInfo &info)
{
create_info_ = info;
diff --git a/tests/vktestbinding.h b/tests/vktestbinding.h
index 77d7f89..d599e2a 100644
--- a/tests/vktestbinding.h
+++ b/tests/vktestbinding.h
@@ -83,9 +83,6 @@
// vkEnumerateLayers()
std::vector<const char *> layers(std::vector<char> &buf) const;
- // vkGetMultiDeviceCompatibility()
- VkPhysicalDeviceCompatibilityInfo compatibility(const PhysicalGpu &other) const;
-
private:
void add_extension_dependencies(uint32_t dependency_count,
VkExtensionProperties *depencency_props,
@@ -300,11 +297,6 @@
// vkAllocMemory()
void init(const Device &dev, const VkMemoryAllocInfo &info);
- // vkOpenSharedMemory()
- void init(const Device &dev, const VkMemoryOpenInfo &info);
- // vkOpenPeerMemory()
- void init(const Device &dev, const VkPeerMemoryOpenInfo &info);
-
void init(const Device &dev, VkDeviceMemory mem);
// vkMapMemory()
@@ -338,8 +330,6 @@
public:
// vkCreateSemaphore()
void init(const Device &dev, const VkSemaphoreCreateInfo &info);
- // vkOpenSharedSemaphore()
- void init(const Device &dev, const VkSemaphoreOpenInfo &info);
static VkSemaphoreCreateInfo create_info(uint32_t init_count, VkFlags flags);
};
@@ -420,8 +410,6 @@
void init(const Device &dev, const VkImageCreateInfo &info);
void init(const Device &dev, const VkImageCreateInfo &info, VkMemoryPropertyFlags &reqs);
void init_no_mem(const Device &dev, const VkImageCreateInfo &info);
- // vkOpenPeerImage()
- void init(const Device &dev, const VkPeerImageOpenInfo &info, const VkImageCreateInfo &original_info);
// vkQueueBindSparseImageMemory()
void bind_memory(const Device &dev, const VkImageMemoryBindInfo &info,