Bug 14621: Change vkGet* functions to not return VkResult
diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index b6acdb9..8fbf83a 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -1275,10 +1275,8 @@
it != test_formats_.end(); it++) {
const float color[4] = { 0.0f, 1.0f, 0.0f, 1.0f };
VkFormatProperties props;
- VkResult err;
- err = vkGetPhysicalDeviceFormatProperties(dev_.phy().handle(), it->format, &props);
- ASSERT_EQ(err, VK_SUCCESS);
+ vkGetPhysicalDeviceFormatProperties(dev_.phy().handle(), it->format, &props);
if (it->tiling == VK_IMAGE_TILING_LINEAR && !(props.linearTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT))
continue;
@@ -1453,10 +1451,8 @@
for (std::vector<vk_testing::Device::Format>::const_iterator it = test_formats_.begin();
it != test_formats_.end(); it++) {
VkFormatProperties props;
- VkResult err;
- err = vkGetPhysicalDeviceFormatProperties(dev_.phy().handle(), it->format, &props);
- ASSERT_EQ(err, VK_SUCCESS);
+ vkGetPhysicalDeviceFormatProperties(dev_.phy().handle(), it->format, &props);
if (it->tiling == VK_IMAGE_TILING_LINEAR && !(props.linearTilingFeatures & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT))
continue;
diff --git a/tests/image_tests.cpp b/tests/image_tests.cpp
index 2d7ff5f..885a0b6 100644
--- a/tests/image_tests.cpp
+++ b/tests/image_tests.cpp
@@ -150,8 +150,7 @@
* amount of data may vary and that doesn't work well for using a
* fixed structure.
*/
- err = vkGetPhysicalDeviceFormatProperties(this->objs[0], fmt, &image_fmt);
- ASSERT_VK_SUCCESS(err);
+ vkGetPhysicalDeviceFormatProperties(this->objs[0], fmt, &image_fmt);
// typedef struct VkImageCreateInfo_
// {
@@ -221,8 +220,7 @@
mem_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
mem_info.pNext = NULL;
- err = vkGetImageMemoryRequirements(device(), m_image, &mem_req);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(device(), m_image, &mem_req);
ASSERT_NE(0, mem_req.size) << "vkGetObjectMemoryRequirements (Image): Failed - expect images to require memory";
mem_info.allocationSize = mem_req.size;
diff --git a/tests/init.cpp b/tests/init.cpp
index 0c058ea..70aa900 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -272,14 +272,12 @@
void getQueue(vk_testing::Device *device, uint32_t queue_node_index, const char *qname)
{
uint32_t que_idx;
- VkResult err;
VkQueue queue;
const VkQueueFamilyProperties 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->handle(), queue_node_index, que_idx, &queue);
- ASSERT_EQ(VK_SUCCESS, err) << "vkGetDeviceQueue: " << qname << " queue #" << que_idx << ": Failed with error: " << vk_result_string(err);
+ vkGetDeviceQueue(device->handle(), queue_node_index, que_idx, &queue);
}
}
@@ -315,8 +313,7 @@
* fixed structure.
*/
- err = vkGetPhysicalDeviceFormatProperties(objs[m_device_id], fmt, &image_fmt);
- ASSERT_VK_SUCCESS(err);
+ vkGetPhysicalDeviceFormatProperties(objs[m_device_id], fmt, &image_fmt);
// typedef struct VkImageCreateInfo_
// {
@@ -364,7 +361,7 @@
ASSERT_VK_SUCCESS(err);
// Verify image resources
-// VkResult VKAPI vkGetImageSubresourceLayout(
+// void VKAPI vkGetImageSubresourceLayout(
// VkImage image,
// const VkImageSubresource* pSubresource,
// VkSubresourceLayout* pLayout);
@@ -394,8 +391,7 @@
while ((_w > 0) || (_h > 0))
{
VkSubresourceLayout layout = {};
- err = vkGetImageSubresourceLayout(device(), image, &subresource, &layout);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageSubresourceLayout(device(), image, &subresource, &layout);
// TODO: 4 should be replaced with pixel size for given format
EXPECT_LE(_w * 4, layout.rowPitch) << "Pitch does not match expected image pitch";
@@ -409,8 +405,7 @@
VkMemoryRequirements mem_req;
VkDeviceMemory image_mem;
- err = vkGetImageMemoryRequirements(device(), image, &mem_req);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(device(), image, &mem_req);
if (mem_req.size) {
diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index 9d1d081..68037f3 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -515,10 +515,9 @@
err = vkCreateImage(m_device->device(), &image_create_info, &image);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(),
+ vkGetImageMemoryRequirements(m_device->device(),
image,
&mem_reqs);
- ASSERT_VK_SUCCESS(err);
mem_alloc.allocationSize = mem_reqs.size;
@@ -665,10 +664,9 @@
err = vkCreateImage(m_device->device(), &image_create_info, &image);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(),
+ vkGetImageMemoryRequirements(m_device->device(),
image,
&mem_reqs);
- ASSERT_VK_SUCCESS(err);
mem_alloc.allocationSize = mem_reqs.size;
err = m_device->phy().set_memory_type(mem_reqs.memoryTypeBits, &mem_alloc, 0);
@@ -922,10 +920,9 @@
err = vkCreateImage(m_device->device(), &image_create_info, &image);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(),
+ vkGetImageMemoryRequirements(m_device->device(),
image,
&mem_reqs);
- ASSERT_VK_SUCCESS(err);
mem_alloc.allocationSize = mem_reqs.size;
@@ -995,10 +992,9 @@
err = vkCreateImage(m_device->device(), &image_create_info, &image);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(),
+ vkGetImageMemoryRequirements(m_device->device(),
image,
&mem_reqs);
- ASSERT_VK_SUCCESS(err);
mem_alloc.allocationSize = mem_reqs.size;
err = m_device->phy().set_memory_type(mem_reqs.memoryTypeBits, &mem_alloc, 0);
@@ -4369,16 +4365,14 @@
memAlloc.allocationSize = 0;
memAlloc.memoryTypeIndex = 0;
- err = vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
err = vkAllocMemory(m_device->device(), &memAlloc, &srcMem);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
@@ -4476,16 +4470,14 @@
memAlloc.allocationSize = 0;
memAlloc.memoryTypeIndex = 0;
- err = vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
err = vkAllocMemory(m_device->device(), &memAlloc, &srcMem);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
@@ -4578,16 +4570,14 @@
memAlloc.allocationSize = 0;
memAlloc.memoryTypeIndex = 0;
- err = vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
err = vkAllocMemory(m_device->device(), &memAlloc, &srcMem);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
@@ -4683,16 +4673,14 @@
memAlloc.allocationSize = 0;
memAlloc.memoryTypeIndex = 0;
- err = vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
err = vkAllocMemory(m_device->device(), &memAlloc, &srcMem);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
@@ -4789,16 +4777,14 @@
memAlloc.allocationSize = 0;
memAlloc.memoryTypeIndex = 0;
- err = vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
err = vkAllocMemory(m_device->device(), &memAlloc, &srcMem);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
@@ -4895,16 +4881,14 @@
memAlloc.allocationSize = 0;
memAlloc.memoryTypeIndex = 0;
- err = vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), srcImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
err = vkAllocMemory(m_device->device(), &memAlloc, &srcMem);
ASSERT_VK_SUCCESS(err);
- err = vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
- ASSERT_VK_SUCCESS(err);
+ vkGetImageMemoryRequirements(m_device->device(), destImage, &memReqs);
memAlloc.allocationSize = memReqs.size;
err = m_device->phy().set_memory_type(memReqs.memoryTypeBits, &memAlloc, 0);
ASSERT_VK_SUCCESS(err);
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index e0b44e4..5c8cc6d 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -312,10 +312,8 @@
VkImageObj *img = new VkImageObj(m_device);
VkFormatProperties props;
- VkResult err;
- err = vkGetPhysicalDeviceFormatProperties(m_device->phy().handle(), m_render_target_fmt, &props);
- ASSERT_VK_SUCCESS(err);
+ vkGetPhysicalDeviceFormatProperties(m_device->phy().handle(), m_render_target_fmt, &props);
if (props.linearTilingFeatures & VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT) {
img->init((uint32_t)m_width, (uint32_t)m_height, m_render_target_fmt,
@@ -691,7 +689,6 @@
uint32_t mipCount;
VkFormatProperties image_fmt;
VkImageTiling tiling;
- VkResult err;
mipCount = 0;
@@ -704,8 +701,7 @@
mipCount++;
}
- err = vkGetPhysicalDeviceFormatProperties(m_device->phy().handle(), fmt, &image_fmt);
- ASSERT_VK_SUCCESS(err);
+ vkGetPhysicalDeviceFormatProperties(m_device->phy().handle(), fmt, &image_fmt);
if (requested_tiling == VK_IMAGE_TILING_LINEAR) {
if (IsCompatible(usage, image_fmt.linearTilingFeatures)) {
diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index 1942592..dfe81a0 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -91,7 +91,7 @@
{
VkPhysicalDeviceProperties info;
- EXPECT(vkGetPhysicalDeviceProperties(handle(), &info) == VK_SUCCESS);
+ vkGetPhysicalDeviceProperties(handle(), &info);
return info;
}
@@ -102,11 +102,9 @@
uint32_t count;
// Call once with NULL data to receive count
- if (EXPECT(vkGetPhysicalDeviceQueueFamilyProperties(handle(), &count, NULL) == VK_SUCCESS)) {
- info.resize(count);
- if (!EXPECT(vkGetPhysicalDeviceQueueFamilyProperties(handle(), &count, info.data()) == VK_SUCCESS))
- info.clear();
- }
+ vkGetPhysicalDeviceQueueFamilyProperties(handle(), &count, NULL);
+ info.resize(count);
+ vkGetPhysicalDeviceQueueFamilyProperties(handle(), &count, info.data());
return info;
}
@@ -115,8 +113,7 @@
{
VkPhysicalDeviceMemoryProperties info;
- EXPECT(vkGetPhysicalDeviceMemoryProperties(handle(), &info) == VK_SUCCESS);
-
+ vkGetPhysicalDeviceMemoryProperties(handle(), &info);
return info;
}
@@ -310,26 +307,22 @@
void Device::init_queues()
{
- VkResult err;
uint32_t queue_node_count;
// Call with NULL data to get count
- err = vkGetPhysicalDeviceQueueFamilyProperties(phy_.handle(), &queue_node_count, NULL);
- EXPECT(err == VK_SUCCESS);
+ vkGetPhysicalDeviceQueueFamilyProperties(phy_.handle(), &queue_node_count, NULL);
EXPECT(queue_node_count >= 1);
VkQueueFamilyProperties* queue_props = new VkQueueFamilyProperties[queue_node_count];
- err = vkGetPhysicalDeviceQueueFamilyProperties(phy_.handle(), &queue_node_count, queue_props);
- EXPECT(err == VK_SUCCESS);
+ vkGetPhysicalDeviceQueueFamilyProperties(phy_.handle(), &queue_node_count, queue_props);
for (uint32_t i = 0; i < queue_node_count; i++) {
VkQueue queue;
for (uint32_t j = 0; j < queue_props[i].queueCount; j++) {
// TODO: Need to add support for separate MEMMGR and work queues, including synchronization
- err = vkGetDeviceQueue(handle(), i, j, &queue);
- EXPECT(err == VK_SUCCESS);
+ vkGetDeviceQueue(handle(), i, j, &queue);
if (queue_props[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) {
queues_[GRAPHICS].push_back(new Queue(queue, i));
@@ -373,10 +366,7 @@
VkFormatProperties Device::format_properties(VkFormat format)
{
VkFormatProperties data;
- VkResult res = vkGetPhysicalDeviceFormatProperties(phy().handle(), format, &data);
- if (res != VK_SUCCESS)
- memset(&data, 0, sizeof(data));
- EXPECT(res == VK_SUCCESS || res == VK_UNSUPPORTED);
+ vkGetPhysicalDeviceFormatProperties(phy().handle(), format, &data);
return data;
}
@@ -538,7 +528,7 @@
{
VkMemoryRequirements reqs;
- EXPECT(vkGetBufferMemoryRequirements(device(), handle(), &reqs) == VK_SUCCESS);
+ vkGetBufferMemoryRequirements(device(), handle(), &reqs);
return reqs;
}
@@ -587,7 +577,7 @@
{
VkMemoryRequirements reqs;
- EXPECT(vkGetImageMemoryRequirements(device(), handle(), &reqs) == VK_SUCCESS);
+ vkGetImageMemoryRequirements(device(), handle(), &reqs);
return reqs;
}
@@ -601,7 +591,8 @@
{
VkSubresourceLayout data;
size_t size = sizeof(data);
- if (!EXPECT(vkGetImageSubresourceLayout(device(), handle(), &subres, &data) == VK_SUCCESS && size == sizeof(data)))
+ vkGetImageSubresourceLayout(device(), handle(), &subres, &data);
+ if (size != sizeof(data))
memset(&data, 0, sizeof(data));
return data;
@@ -612,7 +603,8 @@
VkSubresourceLayout data;
VkImageSubresource subres = subresource(subrescopy.aspect, subrescopy.mipLevel, subrescopy.arrayLayer);
size_t size = sizeof(data);
- if (!EXPECT(vkGetImageSubresourceLayout(device(), handle(), &subres, &data) == VK_SUCCESS && size == sizeof(data)))
+ vkGetImageSubresourceLayout(device(), handle(), &subres, &data);
+ if (size != sizeof(data))
memset(&data, 0, sizeof(data));
return data;
diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index c07d48f..cc39646 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -304,7 +304,6 @@
void VkTestFramework::WritePPM( const char *basename, VkImageObj *image )
{
string filename;
- VkResult err;
uint32_t x, y;
VkImageObj displayImage(image->device());
VkMemoryPropertyFlags reqs = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
@@ -320,8 +319,7 @@
};
VkSubresourceLayout sr_layout;
- err = vkGetImageSubresourceLayout(image->device()->device(), displayImage.image(), &sr, &sr_layout);
- ASSERT_VK_SUCCESS( err );
+ vkGetImageSubresourceLayout(image->device()->device(), displayImage.image(), &sr, &sr_layout);
char *ptr;
ptr = (char *) displayImage.MapMemory();
@@ -435,8 +433,7 @@
VK_IMAGE_ASPECT_COLOR, 0, 0
};
- err = vkGetImageSubresourceLayout(displayImage.device()->device(), displayImage.image(), &sr, &sr_layout);
- ASSERT_VK_SUCCESS( err );
+ vkGetImageSubresourceLayout(displayImage.device()->device(), displayImage.image(), &sr, &sr_layout);
ptr = (char *) displayImage.MapMemory();
ASSERT_VK_SUCCESS( err );