diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2016-02-11 09:26:16 -0700 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-02-12 11:32:22 -0700 |
| commit | cf9784e9137a0f72ca2fbc2b930c9eafe85721eb (patch) | |
| tree | 9bc8d5f0a084291e4a0899e5b6946c61f9fd7f56 /demos | |
| parent | 648f53b546ed182749b394824b9f95cbde2038f8 (diff) | |
| download | usermoji-cf9784e9137a0f72ca2fbc2b930c9eafe85721eb.tar.xz | |
header: Update 1.0.3 header revision for inclusion of debug report extension
Removed vk_ext_debug_report.h (contents moved into vulkan.h)
Renamed debug report message enums
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/cube.c | 5 | ||||
| -rw-r--r-- | demos/tri.c | 5 | ||||
| -rw-r--r-- | demos/vulkaninfo.c | 9 |
3 files changed, 8 insertions, 11 deletions
diff --git a/demos/cube.c b/demos/cube.c index 02e75a5a..d729fb8a 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -42,7 +42,6 @@ #endif // _WIN32 #include <vulkan/vulkan.h> -#include <vulkan/vk_ext_debug_report.h> #include <vulkan/vk_sdk_platform.h> #include "linmath.h" @@ -269,7 +268,7 @@ dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) { sprintf(message, "ERROR: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg); - } else if (msgFlags & VK_DEBUG_REPORT_WARN_BIT_EXT) { + } else if (msgFlags & VK_DEBUG_REPORT_WARNING_BIT_EXT) { // We know that we're submitting queues without fences, ignore this // warning if (strstr(pMsg, @@ -2432,7 +2431,7 @@ static void demo_init_vk(struct demo *demo) { dbgCreateInfo.pfnCallback = callback; dbgCreateInfo.pUserData = NULL; dbgCreateInfo.flags = - VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARN_BIT_EXT; + VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; err = demo->CreateDebugReportCallback(demo->inst, &dbgCreateInfo, NULL, &demo->msg_callback); switch (err) { diff --git a/demos/tri.c b/demos/tri.c index 91b2413a..5910c376 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -51,7 +51,6 @@ #endif // _WIN32 #include <vulkan/vulkan.h> -#include <vulkan/vk_ext_debug_report.h> #define DEMO_TEXTURE_COUNT 1 #define VERTEX_BUFFER_BIND_ID 0 @@ -124,7 +123,7 @@ dbgFunc(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) { sprintf(message, "ERROR: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg); - } else if (msgFlags & VK_DEBUG_REPORT_WARN_BIT_EXT) { + } else if (msgFlags & VK_DEBUG_REPORT_WARNING_BIT_EXT) { sprintf(message, "WARNING: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg); } else { @@ -1999,7 +1998,7 @@ static void demo_init_vk(struct demo *demo) { VkDebugReportCallbackCreateInfoEXT dbgCreateInfo; dbgCreateInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; dbgCreateInfo.flags = - VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARN_BIT_EXT; + VK_DEBUG_REPORT_ERROR_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT; dbgCreateInfo.pfnCallback = dbgFunc; dbgCreateInfo.pUserData = NULL; dbgCreateInfo.pNext = NULL; diff --git a/demos/vulkaninfo.c b/demos/vulkaninfo.c index e1646be2..8f768bf5 100644 --- a/demos/vulkaninfo.c +++ b/demos/vulkaninfo.c @@ -39,7 +39,6 @@ #endif // _WIN32 #include <vulkan/vulkan.h> -#include <vulkan/vk_ext_debug_report.h> #define ERR(err) \ printf("%s:%d: failed with %s\n", __FILE__, __LINE__, \ @@ -139,10 +138,10 @@ dbg_callback(VkFlags msgFlags, VkDebugReportObjectTypeEXT objType, if (msgFlags & VK_DEBUG_REPORT_ERROR_BIT_EXT) { sprintf(message, "ERROR: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg); - } else if (msgFlags & VK_DEBUG_REPORT_WARN_BIT_EXT) { + } else if (msgFlags & VK_DEBUG_REPORT_WARNING_BIT_EXT) { sprintf(message, "WARNING: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg); - } else if (msgFlags & VK_DEBUG_REPORT_INFO_BIT_EXT) { + } else if (msgFlags & VK_DEBUG_REPORT_INFORMATION_BIT_EXT) { sprintf(message, "INFO: [%s] Code %d : %s", pLayerPrefix, msgCode, pMsg); } else if (msgFlags & VK_DEBUG_REPORT_DEBUG_BIT_EXT) { @@ -681,8 +680,8 @@ static void app_create_instance(struct app_instance *inst) { memset(&dbg_info, 0, sizeof(dbg_info)); dbg_info.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT; dbg_info.flags = VK_DEBUG_REPORT_ERROR_BIT_EXT | - VK_DEBUG_REPORT_WARN_BIT_EXT | - VK_DEBUG_REPORT_INFO_BIT_EXT; + VK_DEBUG_REPORT_WARNING_BIT_EXT | + VK_DEBUG_REPORT_INFORMATION_BIT_EXT; dbg_info.pfnCallback = dbg_callback; inst_info.pNext = &dbg_info; |