commit 02bf89d20893955505219208c906ea5976b7e8a4
author Mark Lobodzinski <mark@lunarg.com> Tue May 10 14:45:13 2016 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue May 10 14:45:13 2016 -0600
tree e48be6ea41fbf63aaaa259cf09abbc21e8de14b8
parent de2268efc41316f2606ed91a3c416ea8a75ce655

tests: Fix warnings in layer validation tests

Change-Id: I72b3776b0df146f29084cd7dd2ed0334bf457c89

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index a2aa46f..2ddf42e 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2958,8 +2958,9 @@
     // ObjectTracker should catch this.
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                          "Invalid VkDescriptorPool Object 0xbaad6001");
-    VkDescriptorPool badPool = (VkDescriptorPool)0xbaad6001;
-    vkResetDescriptorPool(device(), badPool, 0);
+    uint64_t fake_pool_handle = 0xbaad6001;
+    VkDescriptorPool bad_pool = reinterpret_cast<VkDescriptorPool &>(fake_pool_handle);
+    vkResetDescriptorPool(device(), bad_pool, 0);
     m_errorMonitor->VerifyFound();
 }
 
@@ -2968,7 +2969,9 @@
     // ObjectTracker should catch this.
     // Create a valid cmd buffer
     // call vkCmdBindDescriptorSets w/ false Descriptor Set
-    VkDescriptorSet badSet = (VkDescriptorSet)0xbaad6001;
+
+    uint64_t fake_set_handle = 0xbaad6001;
+    VkDescriptorSet bad_set = reinterpret_cast<VkDescriptorSet &>(fake_set_handle);
     VkResult err;
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                          "Invalid VkDescriptorSet Object 0xbaad6001");
@@ -3002,7 +3005,7 @@
 
     BeginCommandBuffer();
     vkCmdBindDescriptorSets(m_commandBuffer->GetBufferHandle(), VK_PIPELINE_BIND_POINT_GRAPHICS,
-                            pipeline_layout, 0, 1, &badSet, 0, NULL);
+                            pipeline_layout, 0, 1, &bad_set, 0, NULL);
     m_errorMonitor->VerifyFound();
     EndCommandBuffer();
     vkDestroyPipelineLayout(device(), pipeline_layout, NULL);
@@ -3012,7 +3015,8 @@
 TEST_F(VkLayerTest, InvalidDescriptorSetLayout) {
     // Attempt to create a Pipeline Layout with an invalid Descriptor Set Layout.
     // ObjectTracker should catch this.
-    VkDescriptorSetLayout bad_layout = (VkDescriptorSetLayout)0xbaad6001;
+    uint64_t fake_layout_handle = 0xbaad6001;
+    VkDescriptorSetLayout bad_layout = reinterpret_cast<VkDescriptorSetLayout &>(fake_layout_handle);
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                          "Invalid VkDescriptorSetLayout Object 0xbaad6001");
 
@@ -3032,7 +3036,8 @@
     // ObjectTracker should catch this.
     // Create a valid cmd buffer
     // call vkCmdBindPipeline w/ false Pipeline
-    VkPipeline bad_pipeline = (VkPipeline)0xbaad6001;
+    uint64_t fake_pipeline_handle = 0xbaad6001;
+    VkPipeline bad_pipeline = reinterpret_cast<VkPipeline &>(fake_pipeline_handle);
     m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_ERROR_BIT_EXT,
                                          "Invalid VkPipeline Object 0xbaad6001");
     ASSERT_NO_FATAL_FAILURE(InitState());