From 9de500a41ba5706eb3f39643a22f12d09496c41f Mon Sep 17 00:00:00 2001
From: Alejandro Saucedo <axsauze@gmail.com>
Date: Mon, 10 Aug 2020 06:28:50 +0100
Subject: [PATCH] Removed debug report callback

---
 src/main.cpp | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5f4eff07d..22c7b3695 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -37,9 +37,15 @@ debugMessageCallback(VkDebugReportFlagsEXT flags,
     return VK_FALSE;
 }
 
-class VulkanExample
+class VulkanCompute
 {
   public:
+    vk::Instance mInstance;
+    vk::DebugReportCallbackEXT mDebugReportCallback{};
+
+    /*
+     * C API
+     */
     VkInstance instance;
     VkPhysicalDevice physicalDevice;
     VkDevice device;
@@ -56,8 +62,7 @@ class VulkanExample
     VkPipeline pipeline;
     VkShaderModule shaderModule;
 
-    VkDebugReportCallbackEXT debugReportCallback{};
-    vk::DebugReportCallbackEXT computeDebugReportCallback{};
+    // VkDebugReportCallbackEXT debugReportCallback{};
 
     VkResult createBuffer(VkBufferUsageFlags usageFlags,
                           VkMemoryPropertyFlags memoryPropertyFlags,
@@ -112,7 +117,7 @@ class VulkanExample
         return VK_SUCCESS;
     }
 
-    VulkanExample()
+    VulkanCompute()
     {
         LOG("Running headless compute example\n");
 
@@ -159,8 +164,8 @@ class VulkanExample
         }
 #endif
 
-        vk::Instance computeInstance = vk::createInstance(computeInstanceCreateInfo);
-        this->instance = static_cast<VkInstance>(computeInstance);
+        this->mInstance = vk::createInstance(computeInstanceCreateInfo);
+        this->instance = static_cast<VkInstance>(this->mInstance);
 
 #if DEBUG
         if (validLayerNames.size() > 0) {
@@ -171,9 +176,8 @@ class VulkanExample
             debugCreateInfo.flags = debugFlags;
 
             vk::DispatchLoaderDynamic dispatcher;
-            dispatcher.init(computeInstance, &vkGetInstanceProcAddr);
-            this->computeDebugReportCallback = computeInstance.createDebugReportCallbackEXT(debugCreateInfo, nullptr, dispatcher);
-            this->debugReportCallback = this->computeDebugReportCallback;
+            dispatcher.init(this->mInstance, &vkGetInstanceProcAddr);
+            this->mDebugReportCallback = this->mInstance.createDebugReportCallbackEXT(debugCreateInfo, nullptr, dispatcher);
         }
 #endif
 
@@ -575,7 +579,7 @@ class VulkanExample
         vkFreeMemory(this->device, hostMemory, nullptr);
     }
 
-    ~VulkanExample()
+    ~VulkanCompute()
     {
         vkDestroyPipelineLayout(this->device, this->pipelineLayout, nullptr);
         vkDestroyDescriptorSetLayout(
@@ -588,14 +592,14 @@ class VulkanExample
         vkDestroyShaderModule(this->device, this->shaderModule, nullptr);
         vkDestroyDevice(this->device, nullptr);
 #if DEBUG
-        if (this->computeDebugReportCallback) {
+        if (this->mDebugReportCallback) {
             PFN_vkDestroyDebugReportCallbackEXT vkDestroyDebugReportCallback =
               reinterpret_cast<PFN_vkDestroyDebugReportCallbackEXT>(
                 vkGetInstanceProcAddr(this->instance,
                                       "vkDestroyDebugReportCallbackEXT"));
             assert(vkDestroyDebugReportCallback);
             vkDestroyDebugReportCallback(
-              this->instance, this->computeDebugReportCallback, nullptr);
+              this->instance, this->mDebugReportCallback, nullptr);
         }
 #endif
         vkDestroyInstance(this->instance, nullptr);
@@ -605,7 +609,7 @@ class VulkanExample
 int
 main()
 {
-    VulkanExample* vulkanExample = new VulkanExample();
+    VulkanCompute* vulkanExample = new VulkanCompute();
     std::cout << "Finished.";
     delete (vulkanExample);
     return 0;