[vulkan] Add debug lines for light splats

Disabled, but all that's needed is to uncomment the debug pipeline in
the compose subpass.

libs/video/renderer/Makemodule.am

@@ -324,6 +324,8 @@ light_flat_src = $(vkshaderpath)/light_flat.vert
 light_flat_c = $(vkshaderpath)/light_flat.vert.spvc
 light_splat_src = $(vkshaderpath)/light_splat.vert
 light_splat_c = $(vkshaderpath)/light_splat.vert.spvc
+light_debug_src = $(vkshaderpath)/light_debug.frag
+light_debug_c = $(vkshaderpath)/light_debug.frag.spvc
 lightingf_src = $(vkshaderpath)/lighting.frag
 lightingf_c = $(vkshaderpath)/lighting.frag.spvc
 lighting_h = $(vkshaderpath)/lighting.h
@@ -410,6 +412,8 @@ $(light_flat_c): $(light_flat_src) $(lighting_h)
 
 $(light_splat_c): $(light_splat_src) $(lighting_h)
 
+$(light_debug_c): $(light_debug_src) $(lighting_h)
+
 $(lightingf_c): $(lightingf_src) $(lighting_h)
 
 $(composef_c): $(composef_src) $(oit_blend) $(oit_h)
@@ -469,6 +473,7 @@ vkshader_c = \
 	$(bsp_turbf_c) \
 	$(light_flat_c) \
 	$(light_splat_c) \
+	$(light_debug_c) \
 	$(lightingf_c) \
 	$(composef_c) \
 	$(aliasv_c) \
@@ -552,6 +557,7 @@ EXTRA_DIST += \
 	$(bsp_turbf_src) \
 	$(light_flat_src) \
 	$(light_splat_src) \
+	$(light_debug_src) \
 	$(lightingf_src) \
 	$(lighting_h) \
 	$(composef_src) \

libs/video/renderer/vulkan/device.c

@@ -158,6 +158,7 @@ QFV_CreateDevice (vulkan_ctx_t *ctx, const char **extensions)
 			.geometryShader = 1,
 			.multiViewport = 1,
 			.fragmentStoresAndAtomics = 1,
+			.fillModeNonSolid = 1,
 		};
 		VkDeviceCreateInfo dCreateInfo = {
 			VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO, &multiview_features, 0,

libs/video/renderer/vulkan/rp_main_def.plist

@@ -560,6 +560,11 @@ properties = {
 				name = main;
 				module = $builtin/lighting.frag;
 			};
+			debug_fragment = {
+				stage = fragment;
+				name = main;
+				module = $builtin/light_debug.frag;
+			};
 		};
 		vertexInput_splat = {
 			bindings = (
@@ -1445,6 +1450,7 @@ renderpasses = {
 
 						color = $color.lights;
 						tasks = (
+							{ func = lighting_update_descriptors; },
 							{ func = lighting_bind_descriptors; },
 							{ func = lighting_draw_splats; },
 						);
@@ -1507,6 +1513,33 @@ renderpasses = {
 						);
 						layout = $compose.layout;
 					};
+/*					debug = {
+						@inherit = $compose_base;
+
+						color = $color.lights;
+						tasks = (
+							{ func = lighting_bind_descriptors; },
+							{ func = lighting_draw_splats; },
+						);
+
+						stages = (
+							$lighting.shader.vertex_splat,
+							$lighting.shader.debug_fragment,
+						);
+						vertexInput = $lighting.vertexInput_splat;
+						inputAssembly = $lighting.inputAssembly;
+						layout = $lighting.layout;
+						rasterization = {
+							depthClampEnable = false;
+							rasterizerDiscardEnable = false;
+							polygonMode = line;
+							cullMode = none;
+							frontFace = clockwise;
+							depthBiasEnable = false;
+							lineWidth = 1;
+						};
+						depthStencil = $depth_disable;
+					};*/
 				};
 			};
 		};

libs/video/renderer/vulkan/shader.c

@@ -91,6 +91,8 @@ static
 static
 #include "libs/video/renderer/vulkan/shader/light_splat.vert.spvc"
 static
+#include "libs/video/renderer/vulkan/shader/light_debug.frag.spvc"
+static
 #include "libs/video/renderer/vulkan/shader/lighting.frag.spvc"
 static
 #include "libs/video/renderer/vulkan/shader/compose.frag.spvc"
@@ -156,6 +158,7 @@ static shaderdata_t builtin_shaders[] = {
 	{ "bsp_turb.frag", bsp_turb_frag, sizeof (bsp_turb_frag) },
 	{ "light_flat.vert", light_flat_vert, sizeof (light_flat_vert) },
 	{ "light_splat.vert", light_splat_vert, sizeof (light_splat_vert) },
+	{ "light_debug.frag", light_debug_frag, sizeof (light_debug_frag) },
 	{ "lighting.frag", lighting_frag, sizeof (lighting_frag) },
 	{ "compose.frag", compose_frag, sizeof (compose_frag) },
 	{ "alias.vert", alias_vert, sizeof (alias_vert) },

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

@@ -0,0 +1,11 @@
+#version 450
+#extension GL_GOOGLE_include_directive : enable
+
+layout (location = 0) flat in uint light_index;
+layout (location = 0) out vec4 frag_color;
+
+void
+main (void)
+{
+	frag_color = gl_FrontFacing ? vec4 (1, 0, 1, 1) : vec4 (0, 1, 1, 1);
+}

libs/video/renderer/vulkan/vulkan_lighting.c

@@ -289,16 +289,14 @@ static VkWriteDescriptorSet base_image_write = {
 };
 
 static void
-lighting_bind_descriptors (const exprval_t **params, exprval_t *result,
-						   exprctx_t *ectx)
+lighting_update_descriptors (const exprval_t **params, exprval_t *result,
+							 exprctx_t *ectx)
 {
 	auto taskctx = (qfv_taskctx_t *) ectx;
 	auto ctx = taskctx->ctx;
 	auto device = ctx->device;
 	auto dfunc = device->funcs;
 	auto lctx = ctx->lighting_context;
-	auto cmd = taskctx->cmd;
-	auto layout = taskctx->pipeline->layout;
 
 	auto lframe = &lctx->frames.a[ctx->curFrame];
 
@@ -312,6 +310,21 @@ lighting_bind_descriptors (const exprval_t **params, exprval_t *result,
 	dfunc->vkUpdateDescriptorSets (device->dev,
 								   LIGHTING_DESCRIPTORS,
 								   lframe->descriptors, 0, 0);
+}
+
+static void
+lighting_bind_descriptors (const exprval_t **params, exprval_t *result,
+						   exprctx_t *ectx)
+{
+	auto taskctx = (qfv_taskctx_t *) ectx;
+	auto ctx = taskctx->ctx;
+	auto device = ctx->device;
+	auto dfunc = device->funcs;
+	auto lctx = ctx->lighting_context;
+	auto cmd = taskctx->cmd;
+	auto layout = taskctx->pipeline->layout;
+
+	auto lframe = &lctx->frames.a[ctx->curFrame];
 
 	VkDescriptorSet sets[] = {
 		Vulkan_Matrix_Descriptors (ctx, ctx->curFrame),
@@ -377,6 +390,10 @@ static exprfunc_t lighting_update_lights_func[] = {
 	{ .func = lighting_update_lights },
 	{}
 };
+static exprfunc_t lighting_update_descriptors_func[] = {
+	{ .func = lighting_update_descriptors },
+	{}
+};
 static exprfunc_t lighting_bind_descriptors_func[] = {
 	{ .func = lighting_bind_descriptors },
 	{}
@@ -391,6 +408,8 @@ static exprfunc_t lighting_draw_flats_func[] = {
 };
 static exprsym_t lighting_task_syms[] = {
 	{ "lighting_update_lights", &cexpr_function, lighting_update_lights_func },
+	{ "lighting_update_descriptors", &cexpr_function,
+		lighting_update_descriptors_func },
 	{ "lighting_bind_descriptors", &cexpr_function,
 		lighting_bind_descriptors_func },
 	{ "lighting_draw_splats", &cexpr_function, lighting_draw_splats_func },