X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Fframebuffer_backend.cpp;h=9395635476025473e182653becb57316737006ed;hb=627d68b024f0d2fed4a03f0d9d3bb4b78358d6f3;hp=5b83c3db6b67e8be5c65acd31225ec64d8ec6ebf;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/framebuffer_backend.cpp b/source/backends/vulkan/framebuffer_backend.cpp
index 5b83c3db..93956354 100644
--- a/source/backends/vulkan/framebuffer_backend.cpp
+++ b/source/backends/vulkan/framebuffer_backend.cpp
@@ -2,6 +2,8 @@
 #include "device.h"
 #include "framebuffer.h"
 #include "framebuffer_backend.h"
+#include "renderpass.h"
+#include "swapchaintexture.h"
 #include "vulkan.h"
 
 using namespace std;
@@ -23,11 +25,15 @@ VulkanFramebuffer::VulkanFramebuffer(VulkanFramebuffer &&other):
 
 VulkanFramebuffer::~VulkanFramebuffer()
 {
+	DestroyQueue &dq = device.get_destroy_queue();
 	if(handle)
-		device.get_destroy_queue().destroy(handle);
+		dq.destroy(handle);
+	for(VkImageView h: view_handles)
+		if(h)
+			dq.destroy(h);
 }
 
-bool VulkanFramebuffer::is_format_supported(const FrameFormat &fmt)
+bool VulkanFramebuffer::is_format_supported(const FrameFormat &fmt) const
 {
 	const VulkanFunctions &vk = device.get_functions();
 	for(FrameAttachment a: fmt)
@@ -48,33 +54,93 @@ bool VulkanFramebuffer::is_format_supported(const FrameFormat &fmt)
 	return true;
 }
 
-void VulkanFramebuffer::update(unsigned) const
+bool VulkanFramebuffer::is_presentable() const
+{
+	const Framebuffer &self = *static_cast<const Framebuffer *>(this);
+	return std::any_of(self.attachments.begin(), self.attachments.end(),
+		[](const Framebuffer::Attachment &a){ return dynamic_cast<const SwapChainTexture *>(a.tex); });
+}
+
+void VulkanFramebuffer::update(unsigned mask) const
 {
 	const Framebuffer &self = *static_cast<const Framebuffer *>(this);
 	const VulkanFunctions &vk = device.get_functions();
 
+	if(self.attachments.size()>view_handles.size())
+		view_handles.resize(self.attachments.size());
+
 	if(handle)
 		device.get_destroy_queue().destroy(handle);
 
-	VkImageView vk_attachments[FrameFormat::MAX_ATTACHMENTS] = { };
+	VkImageView vk_attachments[FrameFormat::MAX_ATTACHMENTS*2] = { };
 	unsigned i = 0;
+	bool any_resolve = false;
 	for(const Framebuffer::Attachment &a: self.attachments)
 	{
-		if(a.tex->view_type!=VK_IMAGE_VIEW_TYPE_2D || a.level || a.layer)
-			throw logic_error("Unimplemented texture type in VulkanFramebuffer::update");
-		vk_attachments[i++] = a.tex->view_handle;
+		bool use_tex_view = (a.tex->view_type==VK_IMAGE_VIEW_TYPE_2D || (a.tex->view_type==VK_IMAGE_VIEW_TYPE_2D_ARRAY && a.layer<0));
+
+		if(mask&(1<<i))
+		{
+			if(use_tex_view)
+				a.tex->refresh_mip_views();
+			else
+			{
+				if(view_handles[i])
+					device.get_destroy_queue().destroy(view_handles[i]);
+
+				PixelFormat tex_format = a.tex->get_format();
+
+				VkImageViewCreateInfo view_info = { };
+				view_info.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO;
+				view_info.image = handle_cast<::VkImage>(a.tex->handle);
+				view_info.viewType = (a.layer<0 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D);
+				view_info.format = static_cast<VkFormat>(get_vulkan_pixelformat(tex_format));
+
+				view_info.components.r = VK_COMPONENT_SWIZZLE_R;
+				view_info.components.g = VK_COMPONENT_SWIZZLE_G;
+				view_info.components.b = VK_COMPONENT_SWIZZLE_B;
+				view_info.components.a = VK_COMPONENT_SWIZZLE_A;
+
+				view_info.subresourceRange.aspectMask = get_vulkan_aspect(get_components(tex_format));
+				view_info.subresourceRange.baseMipLevel = a.level;
+				view_info.subresourceRange.levelCount = 1;
+				view_info.subresourceRange.baseArrayLayer = max(a.layer, 0);
+				view_info.subresourceRange.layerCount = (a.layer<0 ? VK_REMAINING_ARRAY_LAYERS : 1);
+
+				vk.CreateImageView(view_info, view_handles[i]);
+			}
+		}
+
+		if(use_tex_view)
+			vk_attachments[i] = a.tex->mip_view_handles[a.level];
+		else if(view_handles[i])
+			vk_attachments[i] = view_handles[i];
+		else
+			throw logic_error("unexpected framebuffer configuration");
+
+		if(a.resolve)
+		{
+			a.resolve->refresh_mip_views();
+			vk_attachments[self.format.size()+i] = a.resolve->mip_view_handles[0];
+			any_resolve = true;
+		}
+
+		++i;
 	}
 
-	VkRenderPass render_pass = device.get_pipeline_cache().get_render_pass(self.format, false, false);
+	RenderPass render_pass;
+	render_pass.framebuffer = &self;
+	render_pass.to_present = is_presentable();
+	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.attachmentCount = self.format.size();
+	framebuffer_info.renderPass = handle_cast<::VkRenderPass>(render_pass.handle);
+	framebuffer_info.attachmentCount = self.format.size()*(1+any_resolve);
 	framebuffer_info.pAttachments = handle_cast<::VkImageView *>(vk_attachments);
 	framebuffer_info.width = self.width;
 	framebuffer_info.height = self.height;
-	framebuffer_info.layers = 1;
+	framebuffer_info.layers = self.layers;
 
 	vk.CreateFramebuffer(framebuffer_info, handle);
 
@@ -82,6 +148,16 @@ void VulkanFramebuffer::update(unsigned) const
 		set_vulkan_object_name();
 }
 
+void VulkanFramebuffer::synchronize_resources(bool discard) const
+{
+	for(const Framebuffer::Attachment &a: static_cast<const Framebuffer *>(this)->attachments)
+	{
+		a.tex->change_layout(a.level, get_vulkan_attachment_layout(get_components(a.tex->get_format())), (discard && a.layer<0));
+		if(a.resolve)
+			a.resolve->change_layout(a.level, get_vulkan_attachment_layout(get_components(a.resolve->get_format())), discard);
+	}
+}
+
 void VulkanFramebuffer::set_debug_name(const string &name)
 {
 #ifdef DEBUG