Skip to content
Snippets Groups Projects
Commit 0552a672 authored by Sebastian Gaida's avatar Sebastian Gaida
Browse files

[#89] whitespaces

parent c967672a
No related branches found
No related tags found
1 merge request!90Resolve "Mehrere Fenster, Abhängigkeiten von Core zu Fenster+Swapchain etc"
Pipeline #26961 failed
...@@ -18,6 +18,7 @@ namespace vkcv { ...@@ -18,6 +18,7 @@ namespace vkcv {
private: private:
Context *m_context; Context *m_context;
void destroySwapchainById(uint64_t id); void destroySwapchainById(uint64_t id);
public: public:
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
namespace vkcv { namespace vkcv {
class Context; class Context;
class SwapchainManager; class SwapchainManager;
class WindowManager { class WindowManager {
...@@ -31,7 +32,8 @@ namespace vkcv { ...@@ -31,7 +32,8 @@ namespace vkcv {
WindowManager &operator=(const WindowManager &other) = delete; WindowManager &operator=(const WindowManager &other) = delete;
WindowHandle createWindow( SwapchainManager &swapchainManager, const char *applicationName, uint32_t windowWidth, uint32_t windowHeight, WindowHandle createWindow(SwapchainManager &swapchainManager, const char *applicationName, uint32_t windowWidth,
uint32_t windowHeight,
bool resizeable); bool resizeable);
[[nodiscard]] [[nodiscard]]
......
...@@ -34,12 +34,12 @@ namespace vkcv { ...@@ -34,12 +34,12 @@ namespace vkcv {
vkcv_log(LogLevel::ERROR, "Invalid id"); vkcv_log(LogLevel::ERROR, "Invalid id");
return; return;
} }
Swapchain& swapchain = m_swapchains[id]; Swapchain &swapchain = m_swapchains[id];
if(swapchain.m_Swapchain){ if (swapchain.m_Swapchain) {
m_context->getDevice().destroySwapchainKHR(swapchain.m_Swapchain); m_context->getDevice().destroySwapchainKHR(swapchain.m_Swapchain);
} }
if(swapchain.m_Surface.handle) { if (swapchain.m_Surface.handle) {
m_context->getInstance().destroySurfaceKHR(swapchain.m_Surface.handle); m_context->getInstance().destroySurfaceKHR(swapchain.m_Surface.handle);
} }
swapchain.m_Swapchain = nullptr; swapchain.m_Swapchain = nullptr;
...@@ -54,23 +54,22 @@ namespace vkcv { ...@@ -54,23 +54,22 @@ namespace vkcv {
return m_context->getDevice().getSwapchainImagesKHR(m_swapchains[handle.getId()].getSwapchain()); return m_context->getDevice().getSwapchainImagesKHR(m_swapchains[handle.getId()].getSwapchain());
} }
std::vector<vk::ImageView> SwapchainManager::createSwapchainImageViews(SwapchainHandle handle){ std::vector<vk::ImageView> SwapchainManager::createSwapchainImageViews(SwapchainHandle handle) {
std::vector<vk::Image> images = getSwapchainImages(handle); std::vector<vk::Image> images = getSwapchainImages(handle);
Swapchain &swapchain = m_swapchains[handle.getId()]; Swapchain &swapchain = m_swapchains[handle.getId()];
std::vector<vk::ImageView> imageViews; std::vector<vk::ImageView> imageViews;
imageViews.reserve( images.size() ); imageViews.reserve(images.size());
//here can be swizzled with vk::ComponentSwizzle if needed //here can be swizzled with vk::ComponentSwizzle if needed
vk::ComponentMapping componentMapping( vk::ComponentMapping componentMapping(
vk::ComponentSwizzle::eR, vk::ComponentSwizzle::eR,
vk::ComponentSwizzle::eG, vk::ComponentSwizzle::eG,
vk::ComponentSwizzle::eB, vk::ComponentSwizzle::eB,
vk::ComponentSwizzle::eA ); vk::ComponentSwizzle::eA);
vk::ImageSubresourceRange subResourceRange( vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1 ); vk::ImageSubresourceRange subResourceRange(vk::ImageAspectFlagBits::eColor, 0, 1, 0, 1);
for ( auto image : images ) for (auto image : images) {
{
vk::ImageViewCreateInfo imageViewCreateInfo( vk::ImageViewCreateInfo imageViewCreateInfo(
vk::ImageViewCreateFlags(), vk::ImageViewCreateFlags(),
image, image,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment