debug utils messenger

diff --git a/tests/common/test.c b/tests/common/test.c
index 80d2c047dd838f5d398b805d799a5379255df104..ed52bd1bf455ed40e2bf2106563c8414e5c3ba9a 100644 (file)
--- a/tests/common/test.c
+++ b/tests/common/test.c
@@ -11,10 +11,10 @@ VkvgDevice device = NULL;
 VkvgSurface surf = NULL;
 
 uint test_size = 100;  // items drawn in one run, or complexity
-int iterations = 500;   // repeat test n times
+int iterations = 10000;   // repeat test n times
 
 static bool paused = false;
-static VkSampleCountFlags samples = VK_SAMPLE_COUNT_4_BIT;
+static VkSampleCountFlags samples = VK_SAMPLE_COUNT_8_BIT;
 static vk_engine_t* e;
 
 static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {

diff --git a/tests/common/vkengine.c b/tests/common/vkengine.c
index 92f699311f35f0667113d2bd9a6bee19871a818f..a33cff48ad76d3f17affc463dbaa4e6dd4534dc3 100644 (file)
--- a/tests/common/vkengine.c
+++ b/tests/common/vkengine.c
@@ -104,7 +104,7 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
     uint32_t enabledExtsCount = 0, phyCount = 0;
     const char** gflwExts = glfwGetRequiredInstanceExtensions (&enabledExtsCount);
 
-    const char* enabledExts [enabledExtsCount+2];
+    const char* enabledExts [enabledExtsCount+1];
 
     for (uint i=0;i<enabledExtsCount;i++)
         enabledExts[i] = gflwExts[i];
@@ -119,14 +119,23 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
     const char* enabledLayers[] = {NULL};
 #endif
 #ifdef DEBUG
-    enabledExts[enabledExtsCount] = "VK_EXT_debug_report";
-    enabledExtsCount++;
     enabledExts[enabledExtsCount] = "VK_EXT_debug_utils";
     enabledExtsCount++;
 #endif
 
 
     e->app = vkh_app_create("vkvgTest", enabledLayersCount, enabledLayers, enabledExtsCount, enabledExts);
+#ifdef DEBUG
+    vkh_app_enable_debug_messenger(e->app
+                                   , VK_DEBUG_UTILS_MESSAGE_TYPE_GENERAL_BIT_EXT
+                                   | VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT
+                                   | VK_DEBUG_UTILS_MESSAGE_TYPE_PERFORMANCE_BIT_EXT
+                                   , VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT
+                                   | VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT
+                                   //| VK_DEBUG_UTILS_MESSAGE_SEVERITY_INFO_BIT_EXT
+                                   //| VK_DEBUG_UTILS_MESSAGE_SEVERITY_VERBOSE_BIT_EXT
+                                   , NULL);
+#endif
 
     glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
     glfwWindowHint(GLFW_RESIZABLE,  GLFW_TRUE);
@@ -189,15 +198,8 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
         }
     }
 
-#if defined(DEBUG) && defined(VKVG_USE_VALIDATION)
-    char const * dex [] = {"VK_KHR_swapchain", "VK_EXT_debug_marker"};
-    enabledExtsCount = 2;
-#else
     char const * dex [] = {"VK_KHR_swapchain"};
     enabledExtsCount = 1;
-#endif
-
-
 
     VkPhysicalDeviceFeatures enabledFeatures = {
         .fillModeNonSolid = true,
@@ -214,16 +216,6 @@ vk_engine_t* vkengine_create (VkPhysicalDeviceType preferedGPU, VkPresentModeKHR
 
     e->dev = vkh_device_create(e->app, pi, &device_info);
 
-#if DEBUG
-    dbgReport = vkh_device_create_debug_report (e->dev,
-
-    //VK_DEBUG_REPORT_INFORMATION_BIT_EXT|
-            VK_DEBUG_REPORT_ERROR_BIT_EXT|
-            VK_DEBUG_REPORT_WARNING_BIT_EXT|
-            VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT|
-            VK_DEBUG_REPORT_DEBUG_BIT_EXT);
-#endif
-
     e->renderer = vkh_presenter_create
             (e->dev, (uint32_t) pi->pQueue, surf, width, height, VK_FORMAT_B8G8R8A8_UNORM, presentMode);
 
@@ -242,10 +234,6 @@ void vkengine_destroy (VkEngine e) {
     vkh_presenter_destroy (e->renderer);
     vkDestroySurfaceKHR (e->app->inst, surf, NULL);
 
-#if DEBUG
-    vkh_device_destroy_debug_report(e->dev, dbgReport);
-#endif
-
     vkh_device_destroy (e->dev);
 
     glfwDestroyWindow (e->window);

diff --git a/vkh b/vkh
index 1e7702d2b18dbe7c777bb8f3bdef60720fb24028..8b50312b74b1c553df094666185c8a6183d42d69 160000 (submodule)
--- a/vkh
+++ b/vkh
@@ -1 +1 @@
-Subproject commit 1e7702d2b18dbe7c777bb8f3bdef60720fb24028
+Subproject commit 8b50312b74b1c553df094666185c8a6183d42d69