commit 426b90566abae5716741aade41184dc4dafe4aa4
author Tony Barbour <tony@LunarG.com> Wed Jun 24 16:06:58 2015 -0600
committer Tony Barbour <tony@LunarG.com> Thu Jun 25 15:17:05 2015 -0600
tree 33f49508ff8b02622d689337b283380a1cdabbc9
parent 01630b8a4ba8b3b6529cbf1a5e5d54df77333ee9

vulkan.h: V108 -- Static Types, Bug# 13919

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index e8c8bf5..880fa68 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -267,13 +267,9 @@
         VK_IMAGE_ASPECT_COLOR, 0, 0
     };
     VkSubresourceLayout sr_layout;
-    size_t data_size = sizeof(sr_layout);
    
-    err = vkGetImageSubresourceInfo(image->device()->device(), displayImage.image(), &sr,
-                                      VK_SUBRESOURCE_INFO_TYPE_LAYOUT,
-                                      &data_size, &sr_layout);
+    err = vkGetImageSubresourceLayout(image->device()->device(), displayImage.image(), &sr, &sr_layout);
     ASSERT_VK_SUCCESS( err );
-    ASSERT_EQ(data_size, sizeof(sr_layout));
 
     char *ptr;
     ptr = (char *) displayImage.map();
@@ -376,7 +372,6 @@
     VkSubresourceLayout sr_layout;
     char *ptr;
     VkTestImageRecord record;
-    size_t data_size = sizeof(sr_layout);
     VkImageObj displayImage(image->device());
     VkMemoryPropertyFlags reqs = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT;
 
@@ -387,11 +382,8 @@
         VK_IMAGE_ASPECT_COLOR, 0, 0
     };
 
-    err = vkGetImageSubresourceInfo(displayImage.device()->device(), displayImage.image(), &sr,
-                                    VK_SUBRESOURCE_INFO_TYPE_LAYOUT,
-                                    &data_size, &sr_layout);
+    err = vkGetImageSubresourceLayout(displayImage.device()->device(), displayImage.image(), &sr, &sr_layout);
     ASSERT_VK_SUCCESS( err );
-    ASSERT_EQ(data_size, sizeof(sr_layout));
 
     err = displayImage.MapMemory( (void **) &ptr );
     ASSERT_VK_SUCCESS( err );