commit 863d5de26e7eaf31025c62f7d1187f1b0e06a59e
author Mark Lobodzinski <mark@lunarg.com> Mon May 22 10:10:07 2017 -0600
committer Mark Lobodzinski <mark@lunarg.com> Tue May 23 15:04:57 2017 -0600
tree 304e3fecc278cb27ef340dc98c17fb68180b28c4
parent 1fbb45005c309b0050dbfc7d7b3710f4d152d9c0

header: Update to 1.0.50 Vulkan version

- updated include/vulkan/vulkan.h
- updated scripts/vk.xml
- updated layers json files
- updated tests json files
- build new verison of vulkan.hpp
- code fixups for deprecated DebugReportError enum

Note that this does NOT include any shader-checker support for the
VK_AMD_texture_gather_bias_lod extension, as this requires glslang
and SPIR-V updates.

Change-Id: Ie01aed143f2fad065c86e2a27e46fe32ccb9e1f7

layers/vk_layer_logging.h

diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
index a47acb0..e0beb5e 100644
--- a/layers/vk_layer_logging.h
+++ b/layers/vk_layer_logging.h
@@ -73,8 +73,8 @@
                 *list_head = cur_callback->pNext;
             }
             debug_report_log_msg(debug_data, VK_DEBUG_REPORT_DEBUG_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT,
-                                 reinterpret_cast<uint64_t &>(cur_callback->msgCallback), 0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT,
-                                 "DebugReport", "Destroyed callback\n");
+                                 reinterpret_cast<uint64_t &>(cur_callback->msgCallback), 0, 0, "DebugReport",
+                                 "Destroyed callback\n");
         } else {
             matched = false;
             local_flags |= cur_callback->msgFlags;
@@ -96,7 +96,7 @@
     while (current_callback) {
         prev_callback = current_callback->pNext;
         debug_report_log_msg(debug_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT,
-                             (uint64_t)current_callback->msgCallback, 0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT, "DebugReport",
+                             (uint64_t)current_callback->msgCallback, 0, 0, "DebugReport",
                              "Debug Report callbacks not removed before DestroyInstance");
         free(current_callback);
         current_callback = prev_callback;
@@ -192,7 +192,7 @@
     }
 
     debug_report_log_msg(debug_data, VK_DEBUG_REPORT_DEBUG_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_EXT,
-                         (uint64_t)*pCallback, 0, VK_DEBUG_REPORT_ERROR_CALLBACK_REF_EXT, "DebugReport", "Added callback");
+                         (uint64_t)*pCallback, 0, 0, "DebugReport", "Added callback");
     return VK_SUCCESS;
 }
 
@@ -383,18 +383,15 @@
     return false;
 }
 
-
-// TODO: Could be autogenerated for the specific handles for extra type safety...

-template <typename HANDLE_T>

-static inline uint64_t HandleToUint64(HANDLE_T *h) {

-    return reinterpret_cast<uint64_t>(h);

-}

-

-template <typename HANDLE_T>

-uint64_t HandleToUint64(HANDLE_T h);

-

-static inline uint64_t HandleToUint64(uint64_t h) {

-    return h;

+// TODO: Could be autogenerated for the specific handles for extra type safety...
+template <typename HANDLE_T>
+static inline uint64_t HandleToUint64(HANDLE_T *h) {
+    return reinterpret_cast<uint64_t>(h);
 }
 
+template <typename HANDLE_T>
+uint64_t HandleToUint64(HANDLE_T h);
+
+static inline uint64_t HandleToUint64(uint64_t h) { return h; }
+
 #endif  // LAYER_LOGGING_H