diff --git a/libs/vulkan/libvulkan.so.1 b/libs/vulkan/libvulkan.so.1 deleted file mode 100644 index 539d42a..0000000 --- a/libs/vulkan/libvulkan.so.1 +++ /dev/null @@ -1 +0,0 @@ -libvulkan.so.1.1.73 \ No newline at end of file diff --git a/libs/vulkan/libvulkan.so.1.1.73 b/libs/vulkan/libvulkan.so.1.1.73 deleted file mode 100644 index 8702e1f..0000000 Binary files a/libs/vulkan/libvulkan.so.1.1.73 and /dev/null differ diff --git a/src/render/render.cpp b/src/render/render.cpp index 5977209..7915081 100644 --- a/src/render/render.cpp +++ b/src/render/render.cpp @@ -18,6 +18,7 @@ + PlumageRender::PlumageRender() { title = "plumage render"; @@ -47,9 +48,9 @@ VkResult PlumageRender::createInstance() appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; appInfo.pApplicationName = "Hello Triangle"; - appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0); + appInfo.applicationVersion = VK_API_VERSION_1_0; appInfo.pEngineName = "No_Engine"; - appInfo.engineVersion = VK_MAKE_VERSION(1, 0, 0); + appInfo.engineVersion = VK_MAKE_API_VERSION(1, 0, 0,0); appInfo.apiVersion = VK_API_VERSION_1_0; // setup createInfo @@ -82,6 +83,7 @@ VkResult PlumageRender::createInstance() if (vkCreateInstance(&createInfo, nullptr, &instance) != VK_SUCCESS) { throw std::runtime_error("failed to create instance"); + } } @@ -114,14 +116,15 @@ bool PlumageRender::checkValidationLayerSupport() std::vector PlumageRender::getRequiredExtensions() { - std::vector extensions; - if (!settings.headless) + + + uint32_t glfwExtensionCount = 0; + const char** glfwExtensions; + glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); + std::vector extensions(glfwExtensions, glfwExtensions + glfwExtensionCount); + if (settings.headless) { - uint32_t glfwExtensionCount = 0; - const char** glfwExtensions; - glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); - - std::vector extensions(glfwExtensions, glfwExtensions + glfwExtensionCount); + extensions.clear(); } if (settings.validation) @@ -131,6 +134,8 @@ std::vector PlumageRender::getRequiredExtensions() } return extensions; + + } void PlumageRender::setupDebugMessager() @@ -3586,11 +3591,13 @@ int main() { PlumageRender plumageRender; - plumageRender.initVulkan(); - if (plumageRender.settings.headless) + if (!plumageRender.settings.headless) { - plumageRender.initWindow(plumageRender.settings.width,plumageRender.settings.height); + plumageRender.initWindow(plumageRender.settings.width, plumageRender.settings.height); } + + plumageRender.initVulkan(); + plumageRender.prepare(); plumageRender.renderLoop(); diff --git a/src/render/render.h b/src/render/render.h index c15c3fe..5f9b65a 100644 --- a/src/render/render.h +++ b/src/render/render.h @@ -30,6 +30,10 @@ #include #include #include +#include +#include +// +#include #include //#include "VulkanExampleBase.h"