IT WORKS

CMakeSettings.json

@@ -21,7 +21,8 @@
             "buildCommandArgs": "",
             "ctestCommandArgs": "",
             "inheritEnvironments": [ "msvc_x64" ],
-            "intelliSenseMode": "windows-msvc-x64"
+            "intelliSenseMode": "windows-msvc-x64",
+            "installRoot": "C:/Program Files/Seele"
         }
     ]
 }

build

@@ -1,6 +0,0 @@
-#!/bin/sh
-rm -rf bin/Debug/x64
-mkdir bin/Debug/x64
-cd bin/Debug/x64
-cmake ../../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PLATFORM=x64
-make

src/Engine/Graphics/Initializer.h

@@ -24,7 +24,7 @@ struct GraphicsInitializer
         : applicationName("SeeleEngine")
         , engineName("SeeleEngine")
         , windowLayoutFile(nullptr)
-        , layers{"VK_LAYER_KHRONOS_validation", "VK_LAYER_LUNARG_monitor"}
+        , layers{"VK_LAYER_LUNARG_monitor"}
         , instanceExtensions{}
         , deviceExtensions{"VK_KHR_swapchain"}
         , windowHandle(nullptr)

src/Engine/Graphics/VertexData.cpp

@@ -13,6 +13,10 @@ constexpr static uint64 NUM_DEFAULT_ELEMENTS = 1024 * 1024;
 
 void VertexData::resetMeshData()
 {
+    for (auto& [_, mat] : materialData)
+    {
+        mat.material->getDescriptorLayout()->reset();
+    }
     materialData.clear();
     if (dirty)
     {

src/Engine/Graphics/Vulkan/Descriptor.cpp

@@ -391,6 +391,7 @@ Gfx::PDescriptorSet DescriptorPool::allocateDescriptorSet()
         {
             //If it hasnt been initialized, allocate it
             VK_CHECK(vkAllocateDescriptorSets(graphics->getDevice(), &allocInfo, &cachedHandles[setIndex]->setHandle));
+            std::cout << "New descriptor " << cachedHandles[setIndex]->setHandle << std::endl;
         }
         cachedHandles[setIndex]->allocate();
         
@@ -406,6 +407,7 @@ Gfx::PDescriptorSet DescriptorPool::allocateDescriptorSet()
     {
         nextAlloc = new DescriptorPool(graphics, layout);
     }
+    std::cout << "Out of descriptors, forwarding" << std::endl;
     return nextAlloc->allocateDescriptorSet();
     //throw std::logic_error("Out of descriptor sets");
 }

src/Engine/Graphics/Vulkan/Graphics.cpp

@@ -332,11 +332,10 @@ void Graphics::initInstance(GraphicsInitializer initInfo)
     info.enabledExtensionCount = (uint32)extensions.size();
     info.ppEnabledExtensionNames = extensions.data();
 #if ENABLE_VALIDATION
+    initInfo.layers.add("VK_LAYER_KHRONOS_validation");
+#endif
     info.enabledLayerCount = (uint32)initInfo.layers.size();
     info.ppEnabledLayerNames = initInfo.layers.data();
-#else
-    info.enabledLayerCount = 0;
-#endif
     VK_CHECK(vkCreateInstance(&info, nullptr, &instance));
 }
 void Graphics::setupDebugCallback()

src/Engine/Graphics/Vulkan/Window.cpp

@@ -248,11 +248,9 @@ void Window::createSwapChain()
     };
     VK_CHECK(vkCreateSwapchainKHR(graphics->getDevice(), &createInfo, nullptr, &swapchain));
 
-    uint32 numImages;
-    vkGetSwapchainImagesKHR(graphics->getDevice(), swapchain, &numImages, swapChainImages.data());
+    VK_CHECK(vkGetSwapchainImagesKHR(graphics->getDevice(), swapchain, &imageCount, swapChainImages.data()));
 
-    assert(numImages == Gfx::numFramesBuffered);
-    for (uint32 i = 0; i < numImages; ++i)
+    for (uint32 i = 0; i < imageCount; ++i)
     {
         swapChainTextures[i] = new Texture2D(graphics, TextureCreateInfo{
                 .format = cast(format.format),

src/Engine/Material/Material.h

@@ -19,6 +19,7 @@ public:
         MaterialNode brdf);
     ~Material();
     const Gfx::PDescriptorLayout getDescriptorLayout() const { return layout; }
+    Gfx::PDescriptorLayout getDescriptorLayout() { return layout; }
     OMaterialInstance instantiate();
     const std::string& getName() const { return materialName; }