inksoul
/
plumageRender
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

清理lib库

InkSoul 2024-04-14 23:34:30 +08:00
parent dc8e2a5979
commit 9a48337d87
4 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/vulkan/libvulkan.so.1
View File

@ -1 +0,0 @@
libvulkan.so.1.1.73

BIN
libs/vulkan/libvulkan.so.1.1.73
View File

Binary file not shown.

23
src/render/render.cpp
View File

@ -18,6 +18,7 @@
PlumageRender::PlumageRender() PlumageRender::PlumageRender()
{ {
title = "plumage render"; title = "plumage render";
@ -47,9 +48,9 @@ VkResult PlumageRender::createInstance()
appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
appInfo.pApplicationName = "Hello Triangle"; appInfo.pApplicationName = "Hello Triangle";
appInfo.applicationVersion = VK_MAKE_VERSION(1, 0, 0); appInfo.applicationVersion = VK_API_VERSION_1_0;
appInfo.pEngineName = "No_Engine"; 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; appInfo.apiVersion = VK_API_VERSION_1_0;
// setup createInfo // setup createInfo
@ -82,6 +83,7 @@ VkResult PlumageRender::createInstance()
if (vkCreateInstance(&createInfo, nullptr, &instance) != VK_SUCCESS) if (vkCreateInstance(&createInfo, nullptr, &instance) != VK_SUCCESS)
{ {
throw std::runtime_error("failed to create instance"); throw std::runtime_error("failed to create instance");
} }
} }
@ -114,14 +116,15 @@ bool PlumageRender::checkValidationLayerSupport()
std::vector<const char*> PlumageRender::getRequiredExtensions() std::vector<const char*> PlumageRender::getRequiredExtensions()
{ {
std::vector<const char*> extensions;
if (!settings.headless)
{
uint32_t glfwExtensionCount = 0; uint32_t glfwExtensionCount = 0;
const char** glfwExtensions; const char** glfwExtensions;
glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount); glfwExtensions = glfwGetRequiredInstanceExtensions(&glfwExtensionCount);
std::vector<const char*> extensions(glfwExtensions, glfwExtensions + glfwExtensionCount); std::vector<const char*> extensions(glfwExtensions, glfwExtensions + glfwExtensionCount);
if (settings.headless)
{
extensions.clear();
} }
if (settings.validation) if (settings.validation)
@ -131,6 +134,8 @@ std::vector<const char*> PlumageRender::getRequiredExtensions()
} }
return extensions; return extensions;
} }
void PlumageRender::setupDebugMessager() void PlumageRender::setupDebugMessager()
@ -3586,11 +3591,13 @@ int main()
{ {
PlumageRender plumageRender; 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.prepare();
plumageRender.renderLoop(); plumageRender.renderLoop();

4
src/render/render.h
View File

@ -30,6 +30,10 @@
#include <iostream> #include <iostream>
#include <optional> #include <optional>
#include <filesystem> #include <filesystem>
#include <cstdint>
#include <stdexcept>
//
#include <commdlg.h>
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
//#include "VulkanExampleBase.h" //#include "VulkanExampleBase.h"