commit f20f87b5aac0c08eb1ce71d2e1930d5f783c9e55
author Tony Barbour <tony@LunarG.com> Wed Apr 22 09:02:32 2015 -0600
committer Tony Barbour <tony@LunarG.com> Wed Apr 22 11:51:35 2015 -0600
tree 3297979ba0a29c952bc2ed0ebbe1a4868477cce4
parent 30a39451aa9374466dad8e00e1cb8fa42b5243c8

misc: Changes to clean up warnings in Release build

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index 0ee92e1..7ba8874 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -477,14 +477,12 @@
         input_mask = VK_MEMORY_INPUT_SHADER_READ_BIT | VK_MEMORY_INPUT_TRANSFER_BIT;
         break;
 
-    case VK_IMAGE_LAYOUT_CLEAR_OPTIMAL:
-        break;
-
     case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL:
         output_mask = VK_MEMORY_OUTPUT_TRANSFER_BIT;
         input_mask = VK_MEMORY_INPUT_SHADER_READ_BIT | VK_MEMORY_INPUT_TRANSFER_BIT;
         break;
 
+    case VK_IMAGE_LAYOUT_CLEAR_OPTIMAL:
     default:
         output_mask =  all_cache_outputs;
         input_mask = all_cache_inputs;
@@ -498,7 +496,7 @@
 void VkImageObj::SetLayout(VkImageAspect aspect,
                            VkImageLayout image_layout)
 {
-    VkResult err;
+    VkResult U_ASSERT_ONLY err;
     VkCommandBufferObj cmd_buf(m_device);
 
     /* Build command buffer to set image layout in the driver */
@@ -598,7 +596,7 @@
 
 VkResult VkImageObj::CopyImage(VkImageObj &src_image)
 {
-    VkResult err;
+    VkResult U_ASSERT_ONLY err;
     VkCommandBufferObj cmd_buf(m_device);
     VkImageLayout src_image_layout, dest_image_layout;
 
@@ -875,6 +873,8 @@
         break;
     default:
         assert(!"unknown index type");
+        m_stride = 2;
+        viewFormat = VK_FORMAT_R16_UINT;
         break;
     }
 

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index cb79abb..9a5df36 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -432,7 +432,7 @@
 
 void  TestFrameworkVkPresent::Display()
 {
-    VkResult err;
+    VkResult U_ASSERT_ONLY err;
 
     VkPresentInfoWSI present = {};
     present.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_WSI;
@@ -523,7 +523,7 @@
 
 void TestFrameworkVkPresent::CreateSwapChain()
 {
-    VkResult err;
+    VkResult U_ASSERT_ONLY err;
 
     VkSwapChainCreateInfoWSI swap_chain = {};
     swap_chain.sType = VK_STRUCTURE_TYPE_SWAP_CHAIN_CREATE_INFO_WSI;

tests/vktestframework.h

diff --git a/tests/vktestframework.h b/tests/vktestframework.h
index e39698a..6e15f79 100644
--- a/tests/vktestframework.h
+++ b/tests/vktestframework.h
@@ -39,6 +39,12 @@
 #include <fstream>
 #include <list>
 
+#if defined(NDEBUG) && defined(__GNUC__)
+#define U_ASSERT_ONLY __attribute__((unused))
+#else
+#define U_ASSERT_ONLY
+#endif
+
 // Can be used by tests to record additional details / description of test
 #define TEST_DESCRIPTION(desc) RecordProperty("description", desc)