diff options
| -rw-r--r-- | main.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
@@ -30,15 +30,17 @@ public: private: - const uint32_t WIDTH = 800; - const uint32_t HEIGHT = 600; + static const uint32_t WIDTH = 800; + static const uint32_t HEIGHT = 600; #ifdef NDEBUG - const bool enableValidationLayers = false; + static const bool enableValidationLayers = false; #else - const bool enableValidationLayers = true; + static const bool enableValidationLayers = true; #endif + static const VkDebugUtilsMessageSeverityFlagBitsEXT minDebugMessageSeverity = VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT; + const std::vector<const char*> validationLayers = { "VK_LAYER_KHRONOS_validation" }; @@ -122,7 +124,7 @@ private: static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) { if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS) { - std::cout << "exit" << std::endl; + std::cout << "ESC pressed -> quitting" << std::endl; static_cast<HelloTriangleApplication*>(glfwGetWindowUserPointer(window))->quit = true; } } @@ -141,10 +143,10 @@ private: VkDebugUtilsMessageTypeFlagsEXT messageType, const VkDebugUtilsMessengerCallbackDataEXT* pCallbackData, void* pUserData) { - //if (messageSeverity >= VK_DEBUG_UTILS_MESSAGE_SEVERITY_WARNING_BIT_EXT) { - std::cerr << "validation layer: " << pCallbackData->pMessage << std::endl; - //} + if (messageSeverity >= minDebugMessageSeverity) { + std::cerr << "validation layer: " << pCallbackData->pMessage << std::endl; + } return VK_FALSE; } @@ -633,7 +635,7 @@ private: vkGetPhysicalDeviceFeatures(device, &deviceFeatures); bool discrete = deviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU; - std::cout << "CHECK: " << deviceProperties.deviceName << " discrete:" << discrete << std::endl; + std::cout << "PHYSICAL DEVICE: " << deviceProperties.deviceName << " discrete:" << discrete << std::endl; printQueueFamilies(device); // return deviceProperties.deviceType == VK_PHYSICAL_DEVICE_TYPE_DISCRETE_GPU && deviceFeatures.geometryShader; @@ -768,7 +770,7 @@ private: for (const char* layerName : validationLayers) { bool layerFound = false; for (const auto& layerProperties : availableLayers) { - std::cout << "LAYER: " << layerProperties.layerName << std::endl; + std::cout << "LAYER AVAILABLE: " << layerProperties.layerName << std::endl; if (strcmp(layerName, layerProperties.layerName) == 0) layerFound=true; } if (!layerFound) return false; @@ -779,14 +781,18 @@ private: std::vector<const char*> getRequiredExtensions() { uint32_t glfwExtensionCount = 0; const char** glfwExtensions; - glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); + glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); //e.g VK_KHR_surface - std::vector<const char*> extensions(glfwExtensions, glfwExtensions + glfwExtensionCount); + std::vector<const char*> extensions(glfwExtensions, glfwExtensions + glfwExtensionCount); // pointer range if (enableValidationLayers) { extensions.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME); } + for (const auto s:extensions){ + std:: cout << "REQUIRED EXTENSION: " << s << std::endl; + } + return extensions; } |