render/vk: Move render_setup into render_pass

Need to use imageless framebuffers, which every driver has implemented

include/render/vulkan.h

@@ -179,17 +179,27 @@ struct wlr_vk_pipeline {
 	struct wl_list link; // struct wlr_vk_render_format_setup
 };
 
+struct wlr_vk_framebuffer {
+	int width, height;
+
+	VkFramebuffer vk;
+	struct wlr_vk_render_format_setup *setup;
+	struct wl_list link; // struct wlr_vk_render_format_setup
+};
+
 // For each format we want to render, we need a separate renderpass
 // and therefore also separate pipelines.
 struct wlr_vk_render_format_setup {
 	struct wl_list link; // wlr_vk_renderer.render_format_setups
 	const struct wlr_vk_format *render_format; // used in renderpass
+	bool has_blending_buffer;
 	VkRenderPass render_pass;
 
 	VkPipeline output_pipe;
 
 	struct wlr_vk_renderer *renderer;
 	struct wl_list pipelines; // struct wlr_vk_pipeline.link
+	struct wl_list framebuffers; // struct wlr_vk_framebuffer.link
 };
 
 // Renderer-internal represenation of an wlr_buffer imported for rendering.
@@ -197,12 +207,12 @@ struct wlr_vk_render_buffer {
 	struct wlr_buffer *wlr_buffer;
 	struct wlr_addon addon;
 	struct wlr_vk_renderer *renderer;
-	struct wlr_vk_render_format_setup *render_setup;
 	struct wl_list link; // wlr_vk_renderer.buffers
 
+	const struct wlr_vk_format *fmt;
+
 	VkImage image;
 	VkImageView image_view;
-	VkFramebuffer framebuffer;
 	uint32_t mem_count;
 	VkDeviceMemory memories[WLR_DMABUF_MAX_PLANES];
 	bool transitioned;
@@ -299,12 +309,18 @@ struct wlr_vk_texture_view {
 	struct wlr_vk_descriptor_pool *ds_pool;
 };
 
+struct wlr_vk_render_format_setup *find_or_create_render_setup(
+	struct wlr_vk_renderer *renderer, const struct wlr_vk_format *format,
+	bool has_blending_buffer);
 struct wlr_vk_pipeline *setup_get_or_create_pipeline(
 	struct wlr_vk_render_format_setup *setup,
 	const struct wlr_vk_pipeline_key *key);
 struct wlr_vk_pipeline_layout *get_or_create_pipeline_layout(
 	struct wlr_vk_renderer *renderer,
 	const struct wlr_vk_pipeline_layout_key *key);
+struct wlr_vk_framebuffer *get_or_create_framebuffer(
+	struct wlr_vk_render_format_setup *setup,
+	int width, int height);
 struct wlr_vk_texture_view *vulkan_texture_get_or_create_view(
 	struct wlr_vk_texture *texture,
 	const struct wlr_vk_pipeline_layout *layout);
@@ -325,6 +341,7 @@ struct wlr_vk_render_pass {
 	struct wlr_render_pass base;
 	struct wlr_vk_renderer *renderer;
 	struct wlr_vk_render_buffer *render_buffer;
+	struct wlr_vk_render_format_setup *render_setup;
 	struct wlr_vk_command_buffer *command_buffer;
 	struct rect_union updated_region;
 	VkPipeline bound_pipeline;

render/vulkan/pass.c

@@ -101,7 +101,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
 		};
 		mat3_to_mat4(final_matrix, vert_pcr_data.mat4);
 
-		bind_pipeline(pass, render_buffer->render_setup->output_pipe);
+		bind_pipeline(pass, pass->render_setup->output_pipe);
 		vkCmdPushConstants(render_cb->vk, renderer->output_pipe_layout,
 			VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(vert_pcr_data), &vert_pcr_data);
 		vkCmdBindDescriptorSets(render_cb->vk,
@@ -476,7 +476,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
 		wlr_matrix_multiply(matrix, pass->projection, matrix);
 
 		struct wlr_vk_pipeline *pipe = setup_get_or_create_pipeline(
-			pass->render_buffer->render_setup,
+			pass->render_setup,
 			&(struct wlr_vk_pipeline_key) {
 				.source = WLR_VK_SHADER_SOURCE_SINGLE_COLOR,
 				.layout = { .ycbcr_format = NULL },
@@ -540,7 +540,6 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
 		const struct wlr_render_texture_options *options) {
 	struct wlr_vk_render_pass *pass = get_render_pass(wlr_pass);
 	struct wlr_vk_renderer *renderer = pass->renderer;
-	struct wlr_vk_render_buffer *render_buffer = pass->render_buffer;
 	VkCommandBuffer cb = pass->command_buffer->vk;
 
 	struct wlr_vk_texture *texture = vulkan_get_texture(options->texture);
@@ -586,7 +585,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
 	mat3_to_mat4(matrix, vert_pcr_data.mat4);
 
 	struct wlr_vk_pipeline *pipe = setup_get_or_create_pipeline(
-		render_buffer->render_setup,
+		pass->render_setup,
 		&(struct wlr_vk_pipeline_key) {
 			.source = WLR_VK_SHADER_SOURCE_TEXTURE,
 			.layout = {
@@ -661,6 +660,21 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
 
 	rect_union_init(&pass->updated_region);
 
+	bool has_blending_buffer = buffer->blend_image != VK_NULL_HANDLE;
+	struct wlr_vk_render_format_setup *render_setup = find_or_create_render_setup(
+		renderer, buffer->fmt, has_blending_buffer);
+	if (render_setup == NULL) {
+		free(pass);
+		return NULL;
+	}
+
+	struct wlr_vk_framebuffer *framebuffer = get_or_create_framebuffer(
+		render_setup, buffer->wlr_buffer->width, buffer->wlr_buffer->height);
+	if (framebuffer == NULL) {
+		free(pass);
+		return NULL;
+	}
+
 	struct wlr_vk_command_buffer *cb = vulkan_acquire_command_buffer(renderer);
 	if (cb == NULL) {
 		free(pass);
@@ -681,12 +695,25 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
 	int width = buffer->wlr_buffer->width;
 	int height = buffer->wlr_buffer->height;
 	VkRect2D rect = { .extent = { width, height } };
+	VkImageView attachments[2] = {0};
+	uint32_t attachment_count = 0;
 
+	if (buffer->blend_image_view != VK_NULL_HANDLE) {
+		attachments[attachment_count++] = buffer->blend_image_view;
+	}
+	attachments[attachment_count++] = buffer->image_view;
+
+	VkRenderPassAttachmentBeginInfo attachment_info = {
+		.sType = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO,
+		.attachmentCount = attachment_count,
+		.pAttachments = attachments,
+	};
 	VkRenderPassBeginInfo rp_info = {
 		.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
+		.pNext = &attachment_info,
 		.renderArea = rect,
-		.renderPass = buffer->render_setup->render_pass,
+		.renderPass = render_setup->render_pass,
-		.framebuffer = buffer->framebuffer,
+		.framebuffer = framebuffer->vk,
 		.clearValueCount = 0,
 	};
 	vkCmdBeginRenderPass(cb->vk, &rp_info, VK_SUBPASS_CONTENTS_INLINE);
@@ -703,6 +730,7 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
 
 	wlr_buffer_lock(buffer->wlr_buffer);
 	pass->render_buffer = buffer;
+	pass->render_setup = render_setup;
 	pass->command_buffer = cb;
 	return pass;
 }

render/vulkan/renderer.c

@@ -55,10 +55,6 @@ struct wlr_vk_renderer *vulkan_get_renderer(struct wlr_renderer *wlr_renderer) {
 	return renderer;
 }
 
-static struct wlr_vk_render_format_setup *find_or_create_render_setup(
-		struct wlr_vk_renderer *renderer, const struct wlr_vk_format *format,
-		bool has_blending_buffer);
-
 static struct wlr_vk_descriptor_pool *alloc_ds(
 		struct wlr_vk_renderer *renderer, VkDescriptorSet *ds,
 		VkDescriptorType type, const VkDescriptorSetLayout *layout,
@@ -164,6 +160,12 @@ static void destroy_render_format_setup(struct wlr_vk_renderer *renderer,
 		vkDestroyPipeline(dev, pipeline->vk, NULL);
 		free(pipeline);
 	}
+
+	struct wlr_vk_framebuffer *framebuffer, *tmp_framebuffer;
+	wl_list_for_each_safe(framebuffer, tmp_framebuffer, &setup->framebuffers, link) {
+		vkDestroyFramebuffer(dev, framebuffer->vk, NULL);
+		free(framebuffer);
+	}
 }
 
 static void shared_buffer_destroy(struct wlr_vk_renderer *r,
@@ -571,7 +573,6 @@ static void destroy_render_buffer(struct wlr_vk_render_buffer *buffer) {
 		wlr_vk_error("vkQueueWaitIdle", res);
 	}
 
-	vkDestroyFramebuffer(dev, buffer->framebuffer, NULL);
 	vkDestroyImageView(dev, buffer->image_view, NULL);
 	vkDestroyImage(dev, buffer->image, NULL);
 
@@ -744,6 +745,7 @@ static struct wlr_vk_render_buffer *create_render_buffer(
 			dmabuf.format, (const char*) &dmabuf.format);
 		goto error;
 	}
+	buffer->fmt = &fmt->format;
 
 	VkImageViewCreateInfo view_info = {
 		.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
@@ -771,41 +773,10 @@ static struct wlr_vk_render_buffer *create_render_buffer(
 
 	bool has_blending_buffer = !using_mutable_srgb;
 
-	buffer->render_setup = find_or_create_render_setup(
+	if (has_blending_buffer && !setup_blend_image(renderer, buffer, dmabuf.width, dmabuf.height)) {
-		renderer, &fmt->format, has_blending_buffer);
-	if (!buffer->render_setup) {
 		goto error;
 	}
 
-	VkImageView attachments[2] = {0};
-	uint32_t attachment_count = 0;
-
-	if (has_blending_buffer) {
-		if (!setup_blend_image(renderer, buffer, dmabuf.width, dmabuf.height)) {
-			goto error;
-		}
-		attachments[attachment_count++] = buffer->blend_image_view;
-	}
-	attachments[attachment_count++] = buffer->image_view;
-
-	VkFramebufferCreateInfo fb_info = {
-		.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
-		.attachmentCount = attachment_count,
-		.pAttachments = attachments,
-		.flags = 0u,
-		.width = dmabuf.width,
-		.height = dmabuf.height,
-		.layers = 1u,
-		.renderPass = buffer->render_setup->render_pass,
-	};
-
-	res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->framebuffer);
-	if (res != VK_SUCCESS) {
-		wlr_vk_error("vkCreateFramebuffer", res);
-		goto error;
-	}
-
-
 	wlr_addon_init(&buffer->addon, &wlr_buffer->addons, renderer,
 		&render_buffer_addon_impl);
 	wl_list_insert(&renderer->render_buffers, &buffer->link);
@@ -821,7 +792,6 @@ error:
 	vkFreeMemory(dev, buffer->blend_memory, NULL);
 	vkDestroyImageView(dev, buffer->blend_image_view, NULL);
 
-	vkDestroyFramebuffer(dev, buffer->framebuffer, NULL);
 	vkDestroyImageView(dev, buffer->image_view, NULL);
 	vkDestroyImage(dev, buffer->image, NULL);
 	for (size_t i = 0u; i < buffer->mem_count; ++i) {
@@ -1897,12 +1867,12 @@ static bool init_static_render_data(struct wlr_vk_renderer *renderer) {
 	return true;
 }
 
-static struct wlr_vk_render_format_setup *find_or_create_render_setup(
+struct wlr_vk_render_format_setup *find_or_create_render_setup(
 		struct wlr_vk_renderer *renderer, const struct wlr_vk_format *format,
 		bool has_blending_buffer) {
 	struct wlr_vk_render_format_setup *setup;
 	wl_list_for_each(setup, &renderer->render_format_setups, link) {
-		if (setup->render_format == format) {
+		if (setup->render_format == format && setup->has_blending_buffer == has_blending_buffer) {
 			return setup;
 		}
 	}
@@ -1914,8 +1884,10 @@ static struct wlr_vk_render_format_setup *find_or_create_render_setup(
 	}
 
 	setup->render_format = format;
+	setup->has_blending_buffer = has_blending_buffer;
 	setup->renderer = renderer;
 	wl_list_init(&setup->pipelines);
+	wl_list_init(&setup->framebuffers);
 
 	VkDevice dev = renderer->dev->dev;
 	VkResult res;
@@ -2153,6 +2125,91 @@ error:
 	return NULL;
 }
 
+struct wlr_vk_framebuffer *get_or_create_framebuffer(
+		struct wlr_vk_render_format_setup *setup,
+		int width, int height) {
+	struct wlr_vk_framebuffer *framebuffer;
+	wl_list_for_each(framebuffer, &setup->framebuffers, link) {
+		if (framebuffer->width == width && framebuffer->height == height) {
+			return framebuffer;
+		}
+	}
+
+	framebuffer = calloc(1u, sizeof(*framebuffer));
+	if (!framebuffer) {
+		wlr_log(WLR_ERROR, "Allocation failed");
+		return NULL;
+	}
+
+	bool using_mutable_srgb = !setup->has_blending_buffer;
+
+	VkResult res;
+	VkDevice dev = setup->renderer->dev->dev;
+	VkFramebufferAttachmentImageInfo attachments[2] = {0};
+	uint32_t attachment_count = 0;
+
+	VkFormat view_formats[] = {
+		setup->render_format->vk,
+		setup->render_format->vk_srgb,
+	};
+	VkFormat blend_view_formats[] = {
+		VK_FORMAT_R16G16B16A16_SFLOAT,
+	};
+
+	if (setup->has_blending_buffer) {
+		attachments[attachment_count++] = (VkFramebufferAttachmentImageInfo) {
+			.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO,
+			.flags = 0,
+			.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
+			.width = width,
+			.height = height,
+			.layerCount = 1,
+			.viewFormatCount = 1,
+			.pViewFormats = blend_view_formats,
+		};
+	}
+	attachments[attachment_count++] = (VkFramebufferAttachmentImageInfo) {
+		.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO,
+		.flags = using_mutable_srgb ? VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT : 0,
+		.usage = vulkan_render_usage,
+		.width = width,
+		.height = height,
+		.layerCount = 1,
+		.viewFormatCount = using_mutable_srgb ? 2 : 1,
+		.pViewFormats = view_formats,
+	};
+
+	VkFramebufferAttachmentsCreateInfo fb_attachments_info = {
+		.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO,
+		.attachmentImageInfoCount = attachment_count,
+		.pAttachmentImageInfos = attachments,
+	};
+	VkFramebufferCreateInfo fb_info = {
+		.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
+		.pNext = &fb_attachments_info,
+		.attachmentCount = attachment_count,
+		.pAttachments = NULL,
+		.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT,
+		.width = width,
+		.height = height,
+		.layers = 1u,
+		.renderPass = setup->render_pass,
+	};
+
+	res = vkCreateFramebuffer(dev, &fb_info, NULL, &framebuffer->vk);
+	if (res != VK_SUCCESS) {
+		wlr_vk_error("vkCreateFramebuffer", res);
+		goto error;
+	}
+
+	wl_list_insert(&setup->framebuffers, &framebuffer->link);
+	return framebuffer;
+
+error:
+	free(framebuffer);
+	return NULL;
+}
+
 struct wlr_renderer *vulkan_renderer_create_for_device(struct wlr_vk_device *dev) {
 	struct wlr_vk_renderer *renderer;
 	VkResult res;

render/vulkan/vulkan.c

@@ -464,6 +464,7 @@ struct wlr_vk_device *vulkan_device_create(struct wlr_vk_instance *ini,
 	extensions[extensions_len++] = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME;
 	extensions[extensions_len++] = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME;
 	extensions[extensions_len++] = VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME; // or vulkan 1.2
+	extensions[extensions_len++] = VK_KHR_IMAGELESS_FRAMEBUFFER_EXTENSION_NAME; // or vulkan 1.2
 	extensions[extensions_len++] = VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME;
 	extensions[extensions_len++] = VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
 	extensions[extensions_len++] = VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME;
@@ -569,8 +570,13 @@ struct wlr_vk_device *vulkan_device_create(struct wlr_vk_instance *ini,
 			"falling back to regular queue priority");
 	}
 
+	VkPhysicalDeviceImagelessFramebufferFeatures imageless_framebuffer_features = {
+		.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES,
+		.imagelessFramebuffer = VK_TRUE,
+	};
 	VkPhysicalDeviceSamplerYcbcrConversionFeatures sampler_ycbcr_features = {
 		.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES,
+		.pNext = &imageless_framebuffer_features,
 		.samplerYcbcrConversion = dev->sampler_ycbcr_conversion,
 	};
 	VkPhysicalDeviceSynchronization2FeaturesKHR sync2_features = {