[vulkan] Do a depth pass for 2d objects

While the HUD and status bar don't cut out a lot of screen (normally),
they might start to make a difference when I get transparency working
properly. The main thing is this is a step towards pulling the 2d
rendering into another render pass so the main deferred pass is
world-only.

include/QF/Vulkan/qf_draw.h

@@ -28,6 +28,13 @@
 #ifndef __QF_Vulkan_qf_draw_h
 #define __QF_Vulkan_qf_draw_h
 
+typedef enum {
+	QFV_drawDepth,
+	QFV_draw2d,
+
+	QFV_drawNumPasses
+} QFV_DrawSubpass;
+
 struct vulkan_ctx_s;
 struct qfv_renderframe_s;
 struct qpic_s;

libs/video/renderer/Makemodule.am

@@ -303,6 +303,8 @@ sprite_depthv_src = $(vkshaderpath)/sprite_depth.vert
 sprite_depthv_c = $(vkshaderpath)/sprite_depth.vert.spvc
 sprite_depthf_src = $(vkshaderpath)/sprite_depth.frag
 sprite_depthf_c = $(vkshaderpath)/sprite_depth.frag.spvc
+twod_depthf_src = $(vkshaderpath)/twod_depth.frag
+twod_depthf_c = $(vkshaderpath)/twod_depth.frag.spvc
 twodv_src = $(vkshaderpath)/twod.vert
 twodv_c = $(vkshaderpath)/twod.vert.spvc
 twodf_src = $(vkshaderpath)/twod.frag
@@ -373,6 +375,8 @@ $(sprite_depthv_c): $(sprite_depthv_src)
 
 $(sprite_depthf_c): $(sprite_depthf_src)
 
+$(twod_depthf_c): $(twod_depthf_src)
+
 $(twodv_c): $(twodv_src)
 
 $(twodf_c): $(twodf_src)
@@ -434,8 +438,7 @@ vkshader_c = \
 	$(sprite_gbuff_c) \
 	$(sprite_depthv_c) \
 	$(sprite_depthf_c) \
-	$(twodv_c) \
+	$(twod_depthf_c) \
-	$(twodf_c) \
 	$(quakebspv_c) \
 	$(quakebspf_c) \
 	$(bsp_depth_c) \
@@ -526,5 +529,6 @@ EXTRA_DIST += \
 	libs/video/renderer/vulkan/shader/sprite_depth.frag \
 	libs/video/renderer/vulkan/shader/sprite_gbuf.vert \
 	libs/video/renderer/vulkan/shader/sprite_gbuf.frag \
+	libs/video/renderer/vulkan/shader/twod_depth.frag \
 	libs/video/renderer/vulkan/shader/twod.frag \
 	libs/video/renderer/vulkan/shader/twod.vert

libs/video/renderer/vulkan/qfpipeline.plist

@@ -1124,6 +1124,29 @@
 			inputAssembly = $properties.inputAssembly.alias;
 			layout = sprite_layout;
 		};
+		twod_depth = {
+			@inherit = $properties.pipelines.depth_base;
+			stages = (
+				{
+					stage = vertex;
+					name = main;
+					module = $builtin/twod.vert;
+				},
+				{
+					stage = fragment;
+					name = main;
+					module = $builtin/twod_depth.frag;
+				},
+			);
+			vertexInput   = $properties.vertexInput.twod;
+			inputAssembly = $properties.inputAssembly.twod;
+			rasterization = $properties.rasterization.counter_cw_cull_back;
+			colorBlend = {
+				logicOpEnable = false;
+				attachments = ($properties.attachmentBlendOp.alpha_blend);
+			};
+			layout = twod_layout;
+		};
 		twod = {
 			@inherit = $properties.pipelines.trans_base;//FIXME should be sparate
 			stages = (
@@ -1141,6 +1164,7 @@
 			vertexInput   = $properties.vertexInput.twod;
 			inputAssembly = $properties.inputAssembly.twod;
 			rasterization = $properties.rasterization.counter_cw_cull_back;
+			depthStencil  = $properties.depthStencil.disable;
 			colorBlend = {
 				logicOpEnable = false;
 				attachments = ($properties.attachmentBlendOp.alpha_blend);

libs/video/renderer/vulkan/shader.c

@@ -67,6 +67,8 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/sprite_depth.frag.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/twod_depth.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/twod.vert.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/twod.frag.spvc"
@@ -134,6 +136,7 @@ static shaderdata_t builtin_shaders[] = {
 	{ "sprite_gbuf.frag", sprite_gbuf_frag, sizeof (sprite_gbuf_frag) },
 	{ "sprite_depth.vert", sprite_depth_vert, sizeof (sprite_depth_vert) },
 	{ "sprite_depth.frag", sprite_depth_frag, sizeof (sprite_depth_frag) },
+	{ "twod_depth.frag", twod_depth_frag, sizeof (twod_depth_frag) },
 	{ "twod.vert", twod_vert, sizeof (twod_vert) },
 	{ "twod.frag", twod_frag, sizeof (twod_frag) },
 	{ "quakebsp.vert", quakebsp_vert, sizeof (quakebsp_vert) },

libs/video/renderer/vulkan/shader/twod_depth.frag

@@ -0,0 +1,17 @@
+#version 450
+
+layout (set = 1, binding = 0) uniform sampler2D Texture;
+
+layout (location = 0) in vec2 st;
+layout (location = 1) in vec4 color;
+
+void
+main (void)
+{
+	vec4        pix;
+
+	pix = texture (Texture, st);
+	if (pix.a * color.a < 1) {
+		discard;
+	}
+}

libs/video/renderer/vulkan/vulkan_bsp.c

@@ -1452,7 +1452,7 @@ Vulkan_Bsp_Init (vulkan_ctx_t *ctx)
 
 		for (int j = 0; j < QFV_bspNumPasses; j++) {
 			QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
-								 bframe->cmdSet.a[i],
+								 bframe->cmdSet.a[j],
 								 va (ctx->va_ctx, "cmd:bsp:%zd:%s", i,
 									 bsp_pass_names[j]));
 		}

libs/video/renderer/vulkan/vulkan_draw.c

@@ -73,6 +73,16 @@
 #include "r_internal.h"
 #include "vid_vulkan.h"
 
+static const char * __attribute__((used)) draw_pass_names[] = {
+	"depth",
+	"2d",
+};
+
+static QFV_Subpass subpass_map[] = {
+	[QFV_drawDepth] = QFV_passDepth,
+	[QFV_draw2d]    = QFV_passTranslucent,
+};
+
 typedef struct descbatch_s {
 	int32_t     descid;		// texture or font descriptor id
 	uint32_t    count;		// number of objects in batch
@@ -144,7 +154,7 @@ typedef struct drawframe_s {
 	slicequeue_t slice_insts;
 	glyphqueue_t glyph_insts;
 	vertqueue_t line_verts;
-	VkCommandBuffer cmd;
+	qfv_cmdbufferset_t cmdSet;
 } drawframe_t;
 
 typedef struct drawframeset_s
@@ -189,6 +199,7 @@ typedef struct drawctx_s {
 	qfv_resobj_t *slice_objects;
 	qfv_resobj_t *glyph_objects;
 	qfv_resobj_t *line_objects;
+	VkPipeline  depth_pipeline;
 	VkPipeline  quad_pipeline;
 	VkPipeline  slice_pipeline;
 	VkPipeline  glyph_pipeline;
@@ -536,6 +547,7 @@ Vulkan_Draw_Shutdown (vulkan_ctx_t *ctx)
 		free (dctx->fonts.a[i].resource);
 	}
 
+	dfunc->vkDestroyPipeline (device->dev, dctx->depth_pipeline, 0);
 	dfunc->vkDestroyPipeline (device->dev, dctx->quad_pipeline, 0);
 	dfunc->vkDestroyPipeline (device->dev, dctx->slice_pipeline, 0);
 	dfunc->vkDestroyPipeline (device->dev, dctx->glyph_pipeline, 0);
@@ -611,6 +623,7 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 
 	flush_draw_scrap (ctx);
 
+	dctx->depth_pipeline = Vulkan_CreateGraphicsPipeline (ctx, "twod_depth");
 	dctx->quad_pipeline = Vulkan_CreateGraphicsPipeline (ctx, "twod");
 	dctx->slice_pipeline = Vulkan_CreateGraphicsPipeline (ctx, "slice");
 	dctx->glyph_pipeline = Vulkan_CreateGraphicsPipeline (ctx, "glyph");
@@ -628,8 +641,6 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 		QFV_ScrapImageView (dctx->scrap),
 		VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
 	};
-	__auto_type cmdBuffers = QFV_AllocCommandBufferSet (frames, alloca);
-	QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, cmdBuffers);
 
 	__auto_type sets = QFV_AllocateDescriptorSet (device, pool, layouts);
 	dctx->quad_set = sets->a[0];
@@ -644,10 +655,19 @@ Vulkan_Draw_Init (vulkan_ctx_t *ctx)
 	dfunc->vkUpdateDescriptorSets (device->dev, 1, write, 0, 0);
 	for (size_t i = 0; i < frames; i++) {
 		__auto_type dframe = &dctx->frames.a[i];
-		dframe->cmd = cmdBuffers->a[i];
+
-		QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+		DARRAY_INIT (&dframe->cmdSet, QFV_drawNumPasses);
-							 dframe->cmd,
+		DARRAY_RESIZE (&dframe->cmdSet, QFV_drawNumPasses);
-							 va (ctx->va_ctx, "cmd:draw:%zd", i));
+		dframe->cmdSet.grow = 0;
+
+		QFV_AllocateCommandBuffers (device, ctx->cmdpool, 1, &dframe->cmdSet);
+
+		for (int j = 0; j < QFV_drawNumPasses; j++) {
+			QFV_duSetObjectName (device, VK_OBJECT_TYPE_COMMAND_BUFFER,
+								 dframe->cmdSet.a[j],
+								 va (ctx->va_ctx, "cmd:draw:%zd:%s", i,
+									 draw_pass_names[j]));
+		}
 	}
 	qfvPopDebug (ctx);
 }
@@ -1110,6 +1130,171 @@ Vulkan_DrawReset (vulkan_ctx_t *ctx)
 {
 }
 
+static void
+draw_begin_subpass (QFV_DrawSubpass subpass, qfv_renderframe_t *rFrame)
+{
+	vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
+	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
+	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
+	VkCommandBuffer cmd = dframe->cmdSet.a[subpass];
+
+	dfunc->vkResetCommandBuffer (cmd, 0);
+	VkCommandBufferInheritanceInfo inherit = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+		rFrame->renderpass->renderpass, subpass_map[subpass],
+		cframe->framebuffer,
+		0, 0, 0,
+	};
+	VkCommandBufferBeginInfo beginInfo = {
+		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
+		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
+		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
+	};
+	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
+
+	QFV_duCmdBeginLabel (device, cmd, va (ctx->va_ctx, "draw:%s",
+										  draw_pass_names[subpass]),
+						 {0.5, 0.8, 0.1, 1});
+}
+
+static void
+draw_end_subpass (VkCommandBuffer cmd, vulkan_ctx_t *ctx)
+{
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+
+	QFV_duCmdEndLabel (device, cmd);
+	dfunc->vkEndCommandBuffer (cmd);
+}
+
+static void
+bind_pipeline (qfv_renderframe_t *rFrame, VkPipeline pipeline,
+			   VkCommandBuffer cmd)
+{
+	vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipeline);
+	dfunc->vkCmdSetViewport (cmd, 0, 1, &rFrame->renderpass->viewport);
+	dfunc->vkCmdSetScissor (cmd, 0, 1, &rFrame->renderpass->scissor);
+}
+
+static void
+draw_quads (qfv_renderframe_t *rFrame, VkCommandBuffer cmd)
+{
+	vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
+
+	VkBuffer    quad_buffer = dframe->quad_buffer;
+	VkBuffer    ind_buffer = dctx->ind_objects[0].buffer.buffer;
+
+	VkDeviceSize offsets[] = {0};
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &quad_buffer, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, ind_buffer, 0, VK_INDEX_TYPE_UINT32);
+	VkDescriptorSet set[2] = {
+		Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
+		dctx->quad_set,
+	};
+	VkPipelineLayout layout = dctx->layout;
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									layout, 0, 2, set, 0, 0);
+
+	dfunc->vkCmdDrawIndexed (cmd, dframe->quad_verts.count * INDS_PER_QUAD,
+							 1, 0, 0, 0);
+}
+
+static void
+draw_slices (qfv_renderframe_t *rFrame, VkCommandBuffer cmd)
+{
+	vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
+
+	VkBuffer    slice_buffer = dframe->slice_buffer;
+	VkBuffer    ind_buffer = dctx->ind_objects[1].buffer.buffer;
+	VkDeviceSize offsets[] = {0};
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &slice_buffer, offsets);
+	dfunc->vkCmdBindIndexBuffer (cmd, ind_buffer, 0, VK_INDEX_TYPE_UINT32);
+
+	uint32_t    inst_start = 0;
+	for (size_t i = 0; i < dframe->slice_batch.size; i++) {
+		int         fontid = dframe->slice_batch.a[i].descid;
+		uint32_t    inst_count = dframe->slice_batch.a[i].count;
+		VkDescriptorSet set[2] = {
+			Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
+			dctx->fonts.a[fontid].set,
+		};
+		VkPipelineLayout layout = dctx->glyph_layout;
+		dfunc->vkCmdBindDescriptorSets (cmd,
+										VK_PIPELINE_BIND_POINT_GRAPHICS,
+										layout, 0, 2, set, 0, 0);
+
+		dfunc->vkCmdDrawIndexed (cmd, 26, inst_count, 0, 0, inst_start);
+		inst_start += inst_count;
+	}
+	DARRAY_RESIZE (&dframe->slice_batch, 0);
+}
+
+static void
+draw_glyphs (qfv_renderframe_t *rFrame, VkCommandBuffer cmd)
+{
+	vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
+
+	VkBuffer    glyph_buffer = dframe->glyph_buffer;
+	VkDeviceSize offsets[] = {0};
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &glyph_buffer, offsets);
+
+	uint32_t    inst_start = 0;
+	for (size_t i = 0; i < dframe->glyph_batch.size; i++) {
+		int         fontid = dframe->glyph_batch.a[i].descid;
+		uint32_t    inst_count = dframe->glyph_batch.a[i].count;
+		VkDescriptorSet set[2] = {
+			Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
+			dctx->fonts.a[fontid].set,
+		};
+		VkPipelineLayout layout = dctx->glyph_layout;
+		dfunc->vkCmdBindDescriptorSets (cmd,
+										VK_PIPELINE_BIND_POINT_GRAPHICS,
+										layout, 0, 2, set, 0, 0);
+
+		dfunc->vkCmdDraw (cmd, 4, inst_count, 0, inst_start);
+		inst_start += inst_count;
+	}
+	DARRAY_RESIZE (&dframe->glyph_batch, 0);
+}
+
+static void
+draw_lines (qfv_renderframe_t *rFrame, VkCommandBuffer cmd)
+{
+	vulkan_ctx_t *ctx = rFrame->vulkan_ctx;
+	qfv_device_t *device = ctx->device;
+	qfv_devfuncs_t *dfunc = device->funcs;
+	drawctx_t  *dctx = ctx->draw_context;
+	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
+
+	VkBuffer    line_buffer = dframe->line_buffer;
+	VkDeviceSize offsets[] = {0};
+	dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &line_buffer, offsets);
+	VkDescriptorSet set[1] = {
+		Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
+	};
+	VkPipelineLayout layout = dctx->layout;
+	dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+									layout, 0, 1, set, 0, 0);
+}
+
 void
 Vulkan_FlushText (qfv_renderframe_t *rFrame)
 {
@@ -1118,7 +1303,6 @@ Vulkan_FlushText (qfv_renderframe_t *rFrame)
 
 	qfv_device_t *device = ctx->device;
 	qfv_devfuncs_t *dfunc = device->funcs;
-	__auto_type cframe = &ctx->frames.a[ctx->curFrame];
 	drawctx_t  *dctx = ctx->draw_context;
 	drawframe_t *dframe = &dctx->frames.a[ctx->curFrame];
 
@@ -1127,10 +1311,6 @@ Vulkan_FlushText (qfv_renderframe_t *rFrame)
 		return;
 	}
 
-	VkCommandBuffer cmd = dframe->cmd;
-	//FIXME which pass?
-	DARRAY_APPEND (&rFrame->subpassCmdSets[QFV_passTranslucent], cmd);
-
 	VkDeviceMemory memory = dctx->draw_resource[1].memory;
 	size_t      atom = device->physDev->properties->limits.nonCoherentAtomSize;
 	size_t      atom_mask = atom - 1;
@@ -1152,121 +1332,40 @@ Vulkan_FlushText (qfv_renderframe_t *rFrame)
 #undef a
 	dfunc->vkFlushMappedMemoryRanges (device->dev, 3, ranges);
 
-	dfunc->vkResetCommandBuffer (cmd, 0);
+	DARRAY_APPEND (&rFrame->subpassCmdSets[subpass_map[QFV_drawDepth]],
-	VkCommandBufferInheritanceInfo inherit = {
+				   dframe->cmdSet.a[QFV_drawDepth]);
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_INFO, 0,
+	DARRAY_APPEND (&rFrame->subpassCmdSets[subpass_map[QFV_draw2d]],
-		rFrame->renderpass->renderpass, QFV_passTranslucent,
+				   dframe->cmdSet.a[QFV_draw2d]);
-		cframe->framebuffer,
-		0, 0, 0
-	};
-	VkCommandBufferBeginInfo beginInfo = {
-		VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO, 0,
-		VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT
-		| VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT, &inherit,
-	};
-	dfunc->vkBeginCommandBuffer (cmd, &beginInfo);
 
-	QFV_duCmdBeginLabel (device, cmd, "twod", { 0.6, 0.2, 0, 1});
+	draw_begin_subpass (QFV_drawDepth, rFrame);
+	draw_begin_subpass (QFV_draw2d, rFrame);
 
 	if (dframe->quad_verts.count) {
-		VkBuffer    quad_buffer = dframe->quad_buffer;
+		bind_pipeline (rFrame, dctx->depth_pipeline,
-		VkBuffer    ind_buffer = dctx->ind_objects[0].buffer.buffer;
+					   dframe->cmdSet.a[QFV_drawDepth]);
-		VkDeviceSize offsets[] = {0};
+		draw_quads (rFrame, dframe->cmdSet.a[QFV_drawDepth]);
-		dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &quad_buffer, offsets);
-		dfunc->vkCmdBindIndexBuffer (cmd, ind_buffer, 0, VK_INDEX_TYPE_UINT32);
-		VkDescriptorSet set[2] = {
-			Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
-			dctx->quad_set,
-		};
-		VkPipelineLayout layout = dctx->layout;
-		dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-										layout, 0, 2, set, 0, 0);
 
-		dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
+		bind_pipeline (rFrame, dctx->quad_pipeline,
-								  dctx->quad_pipeline);
+					   dframe->cmdSet.a[QFV_draw2d]);
-		dfunc->vkCmdSetViewport (cmd, 0, 1, &rFrame->renderpass->viewport);
+		draw_quads (rFrame, dframe->cmdSet.a[QFV_draw2d]);
-		dfunc->vkCmdSetScissor (cmd, 0, 1, &rFrame->renderpass->scissor);
-		dfunc->vkCmdDrawIndexed (cmd, dframe->quad_verts.count * INDS_PER_QUAD,
-								 1, 0, 0, 0);
 	}
-
 	if (dframe->slice_insts.count) {
-		VkBuffer    slice_buffer = dframe->slice_buffer;
+		bind_pipeline (rFrame, dctx->slice_pipeline,
-		VkBuffer    ind_buffer = dctx->ind_objects[1].buffer.buffer;
+					   dframe->cmdSet.a[QFV_draw2d]);
-		VkDeviceSize offsets[] = {0};
+		draw_slices (rFrame, dframe->cmdSet.a[QFV_draw2d]);
-		dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &slice_buffer, offsets);
-		dfunc->vkCmdBindIndexBuffer (cmd, ind_buffer, 0, VK_INDEX_TYPE_UINT32);
-		dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-								  dctx->slice_pipeline);
-		dfunc->vkCmdSetViewport (cmd, 0, 1, &rFrame->renderpass->viewport);
-		dfunc->vkCmdSetScissor (cmd, 0, 1, &rFrame->renderpass->scissor);
-
-		uint32_t    inst_start = 0;
-		for (size_t i = 0; i < dframe->slice_batch.size; i++) {
-			int         fontid = dframe->slice_batch.a[i].descid;
-			uint32_t    inst_count = dframe->slice_batch.a[i].count;
-			VkDescriptorSet set[2] = {
-				Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
-				dctx->fonts.a[fontid].set,
-			};
-			VkPipelineLayout layout = dctx->glyph_layout;
-			dfunc->vkCmdBindDescriptorSets (cmd,
-											VK_PIPELINE_BIND_POINT_GRAPHICS,
-											layout, 0, 2, set, 0, 0);
-
-			dfunc->vkCmdDrawIndexed (cmd, 26, inst_count, 0, 0, inst_start);
-			inst_start += inst_count;
-		}
-		DARRAY_RESIZE (&dframe->slice_batch, 0);
 	}
-
 	if (dframe->glyph_insts.count) {
-		VkBuffer    glyph_buffer = dframe->glyph_buffer;
+		bind_pipeline (rFrame, dctx->glyph_pipeline,
-		VkDeviceSize offsets[] = {0};
+					   dframe->cmdSet.a[QFV_draw2d]);
-		dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &glyph_buffer, offsets);
+		draw_glyphs (rFrame, dframe->cmdSet.a[QFV_draw2d]);
-		dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-								  dctx->glyph_pipeline);
-		dfunc->vkCmdSetViewport (cmd, 0, 1, &rFrame->renderpass->viewport);
-		dfunc->vkCmdSetScissor (cmd, 0, 1, &rFrame->renderpass->scissor);
-
-		uint32_t    inst_start = 0;
-		for (size_t i = 0; i < dframe->glyph_batch.size; i++) {
-			int         fontid = dframe->glyph_batch.a[i].descid;
-			uint32_t    inst_count = dframe->glyph_batch.a[i].count;
-			VkDescriptorSet set[2] = {
-				Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
-				dctx->fonts.a[fontid].set,
-			};
-			VkPipelineLayout layout = dctx->glyph_layout;
-			dfunc->vkCmdBindDescriptorSets (cmd,
-											VK_PIPELINE_BIND_POINT_GRAPHICS,
-											layout, 0, 2, set, 0, 0);
-
-			dfunc->vkCmdDraw (cmd, 4, inst_count, 0, inst_start);
-			inst_start += inst_count;
-		}
-		DARRAY_RESIZE (&dframe->glyph_batch, 0);
 	}
-
 	if (dframe->line_verts.count) {
-		VkBuffer    line_buffer = dframe->line_buffer;
+		bind_pipeline (rFrame, dctx->line_pipeline,
-		VkDeviceSize offsets[] = {0};
+					   dframe->cmdSet.a[QFV_draw2d]);
-		dfunc->vkCmdBindVertexBuffers (cmd, 0, 1, &line_buffer, offsets);
+		draw_lines (rFrame, dframe->cmdSet.a[QFV_draw2d]);
-		VkDescriptorSet set[1] = {
-			Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
-		};
-		VkPipelineLayout layout = dctx->layout;
-		dfunc->vkCmdBindDescriptorSets (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-										layout, 0, 1, set, 0, 0);
-
-		dfunc->vkCmdBindPipeline (cmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
-								  dctx->line_pipeline);
-		dfunc->vkCmdDraw (cmd, dframe->line_verts.count * VERTS_PER_LINE,
-						  1, 0, 0);
 	}
-
+	draw_end_subpass (dframe->cmdSet.a[QFV_drawDepth], ctx);
-	QFV_duCmdEndLabel (device, cmd);
+	draw_end_subpass (dframe->cmdSet.a[QFV_draw2d], ctx);
-	dfunc->vkEndCommandBuffer (cmd);
 
 	dframe->quad_verts.count = 0;
 	dframe->slice_insts.count = 0;