commit b5bc11ea9284dd12c0a6cc499dfdfe2b5fb9c758
author Karl Schultz <karl@lunarg.com> Wed May 04 08:36:08 2016 -0600
committer Karl Schultz <karl@lunarg.com> Wed May 04 08:36:08 2016 -0600
tree 7525bbe08aee111970ae4787d26199746ff1dec0
parent f92621ade2fcf38c3d6315e49e9d0cc28004ec68

tests: Fix image tiling enum to work on nvidia.

Also add robustness fixes so that a failed image creation
does not crash the process.

Change-Id: I14fd56c3968c1bd58c3b89bb2f805da7231df7af

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index b2ebab4..99ce40a 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -1130,7 +1130,7 @@
 TEST_F(VkLayerTest, InvalidUsageBits)
 {
     TEST_DESCRIPTION(
-        "Specify wrong usage for image then create conflictiong view of image "
+        "Specify wrong usage for image then create conflicting view of image "
         "Initialize buffer with wrong usage then perform copy expecting errors "
         "from both the image and the buffer (2 calls)");
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
@@ -1140,7 +1140,8 @@
     VkImageObj image(m_device);
     // Initialize image with USAGE_INPUT_ATTACHMENT
     image.init(128, 128, VK_FORMAT_D32_SFLOAT_S8_UINT,
-               VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, VK_IMAGE_TILING_LINEAR, 0);
+               VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT, VK_IMAGE_TILING_OPTIMAL, 0);
+    ASSERT_TRUE(image.initialized());
 
     VkImageView dsv;
     VkImageViewCreateInfo dsvci = {};

tests/vktestbinding.cpp

diff --git a/tests/vktestbinding.cpp b/tests/vktestbinding.cpp
index e8ebdca..8ef00d9 100644
--- a/tests/vktestbinding.cpp
+++ b/tests/vktestbinding.cpp
@@ -549,14 +549,18 @@
                  VkMemoryPropertyFlags mem_props) {
     init_no_mem(dev, info);
 
-    internal_mem_.init(
-        dev, get_resource_alloc_info(dev, memory_requirements(), mem_props));
-    bind_memory(internal_mem_, 0);
+    if (initialized()) {
+        internal_mem_.init(
+                    dev, get_resource_alloc_info(dev, memory_requirements(), mem_props));
+        bind_memory(internal_mem_, 0);
+    }
 }
 
 void Image::init_no_mem(const Device &dev, const VkImageCreateInfo &info) {
     NON_DISPATCHABLE_HANDLE_INIT(vkCreateImage, dev, &info);
-    init_info(dev, info);
+    if (initialized()) {
+        init_info(dev, info);
+    }
 }
 
 void Image::init_info(const Device &dev, const VkImageCreateInfo &info) {