- fix enough bugs to finally get some visuals

src/rendering/vulkan/system/vk_buffers.cpp

@@ -5,6 +5,16 @@
 #include "vulkan/renderer/vk_renderstate.h"
 #include "doomerrors.h"
 
+VKBuffer::~VKBuffer()
+{
+	if (map)
+		mBuffer->Unmap();
+
+	auto fb = GetVulkanFrameBuffer();
+	if (fb && mBuffer)
+		fb->mFrameDeleteList.push_back(std::move(mBuffer));
+}
+
 void VKBuffer::SetData(size_t size, const void *data, bool staticdata)
 {
 	auto fb = GetVulkanFrameBuffer();
@@ -37,6 +47,8 @@ void VKBuffer::SetData(size_t size, const void *data, bool staticdata)
 		if (mPersistent)
 		{
 			map = mBuffer->Map(0, size);
+			if (data)
+				memcpy(map, data, size);
 		}
 		else if (data)
 		{

src/rendering/vulkan/system/vk_buffers.h

@@ -12,7 +12,7 @@
 class VKBuffer : virtual public IBuffer
 {
 public:
-	~VKBuffer() { if (map) Unmap(); }
+	~VKBuffer();
 
 	void SetData(size_t size, const void *data, bool staticdata) override;
 	void SetSubData(size_t offset, size_t size, const void *data) override;

src/rendering/vulkan/system/vk_builders.cpp

@@ -162,7 +162,7 @@ std::unique_ptr<VulkanShader> ShaderBuilder::create(VulkanDevice *device)
 	glslang::SpvOptions spvOptions;
 	spvOptions.generateDebugInfo = false;
 	spvOptions.disableOptimizer = false;
-	spvOptions.optimizeSize = false;
+	spvOptions.optimizeSize = true;
 
 	std::vector<unsigned int> spirv;
 	spv::SpvBuildLogger logger;

src/rendering/vulkan/system/vk_device.cpp

@@ -390,6 +390,9 @@ void VulkanDevice::releaseResources()
 	renderFinishedFence.reset();
 	swapChain.reset();
 
+	if (allocator)
+		vmaDestroyAllocator(allocator);
+
 	if (device)
 		vkDestroyDevice(device, nullptr);
 	device = nullptr;

src/rendering/vulkan/system/vk_framebuffer.cpp

@@ -63,12 +63,22 @@ VulkanFrameBuffer::VulkanFrameBuffer(void *hMonitor, bool fullscreen, VulkanDevi
 
 VulkanFrameBuffer::~VulkanFrameBuffer()
 {
+	delete MatricesUBO;
+	delete ColorsUBO;
+	delete GlowingWallsUBO;
+	delete mVertexData;
+	delete mSkyData;
+	delete mViewpoints;
+	delete mLights;
 	for (auto tex : AllTextures)
 		tex->Reset();
 }
 
 void VulkanFrameBuffer::InitializeState()
 {
+	gl_vendorstring = "Vulkan";
+	hwcaps = RFL_SHADER_STORAGE_BUFFER | RFL_BUFFER_STORAGE;
+
 	mUploadSemaphore.reset(new VulkanSemaphore(device));
 	mGraphicsCommandPool.reset(new VulkanCommandPool(device, device->graphicsFamily));
 
@@ -81,9 +91,9 @@ void VulkanFrameBuffer::InitializeState()
 	MatricesUBO = (VKDataBuffer*)CreateDataBuffer(1234, false);
 	ColorsUBO = (VKDataBuffer*)CreateDataBuffer(1234, false);
 	GlowingWallsUBO = (VKDataBuffer*)CreateDataBuffer(1234, false);
-	MatricesUBO->SetData(sizeof(MatricesUBO) * 128, 0, false);
-	ColorsUBO->SetData(sizeof(ColorsUBO) * 128, 0, false);
-	GlowingWallsUBO->SetData(sizeof(GlowingWallsUBO) * 128, 0, false);
+	MatricesUBO->SetData(sizeof(MatricesUBO) * 128, nullptr, false);
+	ColorsUBO->SetData(sizeof(ColorsUBO) * 128, nullptr, false);
+	GlowingWallsUBO->SetData(sizeof(GlowingWallsUBO) * 128, nullptr, false);
 
 	mShaderManager.reset(new VkShaderManager(device));
 	mSamplerManager.reset(new VkSamplerManager(device));
@@ -148,6 +158,8 @@ void VulkanFrameBuffer::Update()
 
 	if (mUploadCommands)
 	{
+		mUploadCommands->end();
+
 		// Submit upload commands immediately
 		VkSubmitInfo submitInfo = {};
 		submitInfo.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO;
@@ -201,6 +213,7 @@ void VulkanFrameBuffer::Update()
 
 	mPresentCommands.reset();
 	mUploadCommands.reset();
+	mFrameDeleteList.clear();
 
 	Finish.Unclock();
 

src/rendering/vulkan/system/vk_framebuffer.h

@@ -32,6 +32,8 @@ public:
 	VKDataBuffer *ColorsUBO = nullptr;
 	VKDataBuffer *GlowingWallsUBO = nullptr;
 
+	std::vector<std::unique_ptr<VulkanBuffer>> mFrameDeleteList;
+
 	VulkanFrameBuffer(void *hMonitor, bool fullscreen, VulkanDevice *dev);
 	~VulkanFrameBuffer();