From 1b4d387b74b2108f3926796d8115bee134fbf7f1 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Tue, 22 Mar 2022 09:19:39 +0200
Subject: [PATCH] Some adjustments to includes

---
 source/backends/vulkan/device_backend.cpp      | 1 +
 source/backends/vulkan/device_backend.h        | 1 +
 source/backends/vulkan/framebuffer_backend.cpp | 7 +++++--
 source/backends/vulkan/framebuffer_backend.h   | 1 +
 source/backends/vulkan/pipelinecache.cpp       | 3 ---
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/source/backends/vulkan/device_backend.cpp b/source/backends/vulkan/device_backend.cpp
index f1f2e327..9a8b930d 100644
--- a/source/backends/vulkan/device_backend.cpp
+++ b/source/backends/vulkan/device_backend.cpp
@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <msp/graphics/vulkancontext_platform.h>
+#include <msp/strings/lexicalcast.h>
 #include "device.h"
 #include "device_backend.h"
 #include "vulkan.h"
diff --git a/source/backends/vulkan/device_backend.h b/source/backends/vulkan/device_backend.h
index d490c6f9..1011da6b 100644
--- a/source/backends/vulkan/device_backend.h
+++ b/source/backends/vulkan/device_backend.h
@@ -2,6 +2,7 @@
 #define MSP_GL_DEVICE_BACKEND_H_
 
 #include <msp/core/noncopyable.h>
+#include <msp/core/refptr.h>
 #include <msp/graphics/vulkancontext.h>
 #include "descriptorpool.h"
 #include "destroyqueue.h"
diff --git a/source/backends/vulkan/framebuffer_backend.cpp b/source/backends/vulkan/framebuffer_backend.cpp
index 48b25f2a..5db8c356 100644
--- a/source/backends/vulkan/framebuffer_backend.cpp
+++ b/source/backends/vulkan/framebuffer_backend.cpp
@@ -2,6 +2,7 @@
 #include "device.h"
 #include "framebuffer.h"
 #include "framebuffer_backend.h"
+#include "renderpass.h"
 #include "vulkan.h"
 
 using namespace std;
@@ -111,11 +112,13 @@ void VulkanFramebuffer::update(unsigned mask) const
 		++i;
 	}
 
-	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(self.format, false, false, false);
+	RenderPass render_pass;
+	render_pass.framebuffer = &self;
+	render_pass.update(device);
 
 	VkFramebufferCreateInfo framebuffer_info = { };
 	framebuffer_info.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO;
-	framebuffer_info.renderPass = handle_cast<::VkRenderPass>(render_pass);
+	framebuffer_info.renderPass = handle_cast<::VkRenderPass>(render_pass.handle);
 	framebuffer_info.attachmentCount = self.format.size();
 	framebuffer_info.pAttachments = handle_cast<::VkImageView *>(vk_attachments);
 	framebuffer_info.width = self.width;
diff --git a/source/backends/vulkan/framebuffer_backend.h b/source/backends/vulkan/framebuffer_backend.h
index b53d1751..3fa75421 100644
--- a/source/backends/vulkan/framebuffer_backend.h
+++ b/source/backends/vulkan/framebuffer_backend.h
@@ -13,6 +13,7 @@ class Texture;
 
 class VulkanFramebuffer: public NonCopyable
 {
+	friend class RenderPass;
 	friend class VulkanCommands;
 	friend class VulkanPipelineState;
 
diff --git a/source/backends/vulkan/pipelinecache.cpp b/source/backends/vulkan/pipelinecache.cpp
index 052ce37f..646d7932 100644
--- a/source/backends/vulkan/pipelinecache.cpp
+++ b/source/backends/vulkan/pipelinecache.cpp
@@ -1,11 +1,8 @@
 #include <msp/core/hash.h>
-#include "blend.h"
-#include "depthtest.h"
 #include "device.h"
 #include "framebuffer.h"
 #include "pipelinecache.h"
 #include "pipelinestate.h"
-#include "stenciltest.h"
 #include "vulkan.h"
 
 using namespace std;
-- 
2.43.0