diff --git a/src/engine/renderer/dx.cpp b/src/engine/renderer/dx.cpp
index 899a298..fccf860 100644
--- a/src/engine/renderer/dx.cpp
+++ b/src/engine/renderer/dx.cpp
@@ -371,55 +371,55 @@ void dx_initialize() {
 	//
 	// Standard pipelines.
 	//
-
-	// skybox
-	{
-		Vk_Pipeline_Def def;
-		def.shader_type = Vk_Shader_Type::single_texture;
-		def.state_bits = 0;
-		def.face_culling = CT_FRONT_SIDED;
-		def.polygon_offset = false;
-		def.clipping_plane = false;
-		def.mirror = false;
-		dx.skybox_pipeline_state = create_pipeline(def);
-	}
-
-	// Q3 stencil shadows
 	{
+		// skybox
 		{
 			Vk_Pipeline_Def def;
-			def.polygon_offset = false;
-			def.state_bits = 0;
 			def.shader_type = Vk_Shader_Type::single_texture;
+			def.state_bits = 0;
+			def.face_culling = CT_FRONT_SIDED;
+			def.polygon_offset = false;
 			def.clipping_plane = false;
-			def.shadow_phase = Vk_Shadow_Phase::shadow_edges_rendering;
+			def.mirror = false;
+			dx.skybox_pipeline_state = create_pipeline(def);
+		}
 
-			cullType_t cull_types[2] = {CT_FRONT_SIDED, CT_BACK_SIDED};
-			bool mirror_flags[2] = {false, true};
+		// Q3 stencil shadows
+		{
+			{
+				Vk_Pipeline_Def def;
+				def.polygon_offset = false;
+				def.state_bits = 0;
+				def.shader_type = Vk_Shader_Type::single_texture;
+				def.clipping_plane = false;
+				def.shadow_phase = Vk_Shadow_Phase::shadow_edges_rendering;
 
-			for (int i = 0; i < 2; i++) {
-				def.face_culling = cull_types[i];
-				for (int j = 0; j < 2; j++) {
-					def.mirror = mirror_flags[j];
-					dx.shadow_volume_pipeline_states[i][j] = create_pipeline(def);
+				cullType_t cull_types[2] = {CT_FRONT_SIDED, CT_BACK_SIDED};
+				bool mirror_flags[2] = {false, true};
+
+				for (int i = 0; i < 2; i++) {
+					def.face_culling = cull_types[i];
+					for (int j = 0; j < 2; j++) {
+						def.mirror = mirror_flags[j];
+						dx.shadow_volume_pipeline_states[i][j] = create_pipeline(def);
+					}
 				}
 			}
+
+			{
+				Vk_Pipeline_Def def;
+				def.face_culling = CT_FRONT_SIDED;
+				def.polygon_offset = false;
+				def.state_bits = GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
+				def.shader_type = Vk_Shader_Type::single_texture;
+				def.clipping_plane = false;
+				def.mirror = false;
+				def.shadow_phase = Vk_Shadow_Phase::fullscreen_quad_rendering;
+				dx.shadow_finish_pipeline_state = create_pipeline(def);
+			}
 		}
 
-		{
-			Vk_Pipeline_Def def;
-			def.face_culling = CT_FRONT_SIDED;
-			def.polygon_offset = false;
-			def.state_bits = GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_DST_COLOR | GLS_DSTBLEND_ZERO;
-			def.shader_type = Vk_Shader_Type::single_texture;
-			def.clipping_plane = false;
-			def.mirror = false;
-			def.shadow_phase = Vk_Shadow_Phase::fullscreen_quad_rendering;
-			dx.shadow_finish_pipeline_state = create_pipeline(def);
-		}
-	}
-
-	// fog and dlights
+		// fog and dlights
 		{
 			Vk_Pipeline_Def def;
 			def.shader_type = Vk_Shader_Type::single_texture;
@@ -456,6 +456,42 @@ void dx_initialize() {
 			}
 		}
 
+		// debug pipelines
+		{
+			Vk_Pipeline_Def def;
+			def.state_bits = GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE;
+			dx.tris_debug_pipeline_state = create_pipeline(def);
+		}
+		{
+			Vk_Pipeline_Def def;
+			def.state_bits = GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE;
+			def.face_culling = CT_BACK_SIDED;
+			dx.tris_mirror_debug_pipeline_state = create_pipeline(def);
+		}
+		{
+			Vk_Pipeline_Def def;
+			def.state_bits = GLS_DEPTHMASK_TRUE;
+			def.line_primitives = true;
+			dx.normals_debug_pipeline_state = create_pipeline(def);
+		}
+		{
+			Vk_Pipeline_Def def;
+			def.state_bits = GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE;
+			dx.surface_debug_pipeline_state_solid = create_pipeline(def);
+		}
+		{
+			Vk_Pipeline_Def def;
+			def.state_bits = GLS_POLYMODE_LINE | GLS_DEPTHMASK_TRUE | GLS_SRCBLEND_ONE | GLS_DSTBLEND_ONE;
+			def.line_primitives = true;
+			dx.surface_debug_pipeline_state_outline = create_pipeline(def);
+		}
+		{
+			Vk_Pipeline_Def def;
+			def.state_bits = GLS_DEPTHTEST_DISABLE | GLS_SRCBLEND_SRC_ALPHA | GLS_DSTBLEND_ONE_MINUS_SRC_ALPHA;
+			dx.images_debug_pipeline_state = create_pipeline(def);
+		}
+	}
+
 	dx.active = true;
 }
 
@@ -477,6 +513,13 @@ void dx_shutdown() {
 			}
 	}
 
+	dx.tris_debug_pipeline_state->Release();
+	dx.tris_mirror_debug_pipeline_state->Release();
+	dx.normals_debug_pipeline_state->Release();
+	dx.surface_debug_pipeline_state_solid->Release();
+	dx.surface_debug_pipeline_state_outline->Release();
+	dx.images_debug_pipeline_state->Release();
+
 	dx.swapchain.Reset();
 
 	dx.command_allocator->Release();
@@ -906,7 +949,7 @@ static ID3D12PipelineState* create_pipeline(const Vk_Pipeline_Def& def) {
 	pipeline_desc.SampleMask = UINT_MAX;
 	pipeline_desc.RasterizerState = rasterization_state;
 	pipeline_desc.DepthStencilState = depth_stencil_state;
-	pipeline_desc.InputLayout = { input_element_desc, _countof(input_element_desc) };
+	pipeline_desc.InputLayout = { input_element_desc, def.shader_type == Vk_Shader_Type::single_texture ? 3u : 4u };
 	pipeline_desc.PrimitiveTopologyType = def.line_primitives ? D3D12_PRIMITIVE_TOPOLOGY_TYPE_LINE : D3D12_PRIMITIVE_TOPOLOGY_TYPE_TRIANGLE;
 	pipeline_desc.NumRenderTargets = 1;
 	pipeline_desc.RTVFormats[0] = DXGI_FORMAT_R8G8B8A8_UNORM;
@@ -1216,7 +1259,7 @@ void dx_bind_geometry() {
 	dx.command_list->SetGraphicsRoot32BitConstants(0, root_constant_count, root_constants, 0);
 }
 
-void dx_shade_geometry(ID3D12PipelineState* pipeline_state, bool multitexture, Vk_Depth_Range depth_range, bool indexed) {
+void dx_shade_geometry(ID3D12PipelineState* pipeline_state, bool multitexture, Vk_Depth_Range depth_range, bool indexed, bool lines) {
 	// color
 	{
 		if ((dx.color_st_elements + tess.numVertexes) * sizeof(color4ub_t) > COLOR_SIZE)
@@ -1288,6 +1331,8 @@ void dx_shade_geometry(ID3D12PipelineState* pipeline_state, bool multitexture, V
 	// bind pipeline
 	dx.command_list->SetPipelineState(pipeline_state);
 
+	dx.command_list->IASetPrimitiveTopology(lines ? D3D10_PRIMITIVE_TOPOLOGY_LINELIST : D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST);
+
 	// configure pipeline's dynamic state
 	D3D12_RECT scissor_rect = get_scissor_rect();
 	dx.command_list->RSSetScissorRects(1, &scissor_rect);
diff --git a/src/engine/renderer/dx.h b/src/engine/renderer/dx.h
index 61421a0..a23bbf3 100644
--- a/src/engine/renderer/dx.h
+++ b/src/engine/renderer/dx.h
@@ -56,7 +56,7 @@ ID3D12PipelineState* dx_find_pipeline(const Vk_Pipeline_Def& def);
 //
 void dx_clear_attachments(bool clear_depth_stencil, bool clear_color, vec4_t color);
 void dx_bind_geometry();
-void dx_shade_geometry(ID3D12PipelineState* pipeline_state, bool multitexture, Vk_Depth_Range depth_range, bool indexed = true);
+void dx_shade_geometry(ID3D12PipelineState* pipeline_state, bool multitexture, Vk_Depth_Range depth_range, bool indexed, bool lines);
 void dx_begin_frame();
 void dx_end_frame();
 
diff --git a/src/engine/renderer/tr_shade.c b/src/engine/renderer/tr_shade.c
index 9ce2c93..d6c5445 100644
--- a/src/engine/renderer/tr_shade.c
+++ b/src/engine/renderer/tr_shade.c
@@ -121,6 +121,13 @@ static void DrawTris (shaderCommands_t *input) {
 		auto pipeline = backEnd.viewParms.isMirror ? vk.tris_mirror_debug_pipeline : vk.tris_debug_pipeline;
 		vk_shade_geometry(pipeline, false, Vk_Depth_Range::force_zero);
 	}
+
+	// DX12
+	if (dx.active) {
+		Com_Memset(tess.svars.colors, tr.identityLightByte, tess.numVertexes * 4 );
+		auto pipeline_state = backEnd.viewParms.isMirror ? dx.tris_mirror_debug_pipeline_state : dx.tris_debug_pipeline_state;
+		dx_shade_geometry(pipeline_state, false, Vk_Depth_Range::force_zero, true, false);
+	}
 }
 
 
@@ -151,7 +158,8 @@ static void DrawNormals (shaderCommands_t *input) {
 	qglDepthRange( 0, 1 );
 
 	// VULKAN
-	if (vk.active) {
+	// DX12
+	if (vk.active || dx.active) {
 		vec4_t xyz[SHADER_MAX_VERTEXES];
 		Com_Memcpy(xyz, tess.xyz, tess.numVertexes * sizeof(vec4_t));
 		Com_Memset(tess.svars.colors, tr.identityLightByte, SHADER_MAX_VERTEXES * sizeof(color4ub_t));
@@ -170,8 +178,14 @@ static void DrawNormals (shaderCommands_t *input) {
 			tess.numVertexes = 2 * count;
 			tess.numIndexes = 0;
 
-			vk_bind_geometry();
-			vk_shade_geometry(vk.normals_debug_pipeline, false, Vk_Depth_Range::force_zero, false);
+			if (vk.active) {
+				vk_bind_geometry();
+				vk_shade_geometry(vk.normals_debug_pipeline, false, Vk_Depth_Range::force_zero, false);
+			}
+			if (dx.active) {
+				dx_bind_geometry();
+				dx_shade_geometry(dx.normals_debug_pipeline_state, false, Vk_Depth_Range::force_zero, false, true);
+			}
 
 			i += count;
 		}
@@ -402,7 +416,7 @@ static void ProjectDlightTexture( void ) {
 		// DX12
 		if (dx.active) {
 			auto pipeline_state = dx.dlight_pipeline_states[dl->additive > 0 ? 1 : 0][tess.shader->cullType][tess.shader->polygonOffset];
-			dx_shade_geometry(pipeline_state, false, Vk_Depth_Range::normal);
+			dx_shade_geometry(pipeline_state, false, Vk_Depth_Range::normal, true, false);
 		}
 	}
 }
@@ -454,7 +468,7 @@ static void RB_FogPass( void ) {
 	if (dx.active) {
 		assert(tess.shader->fogPass > 0);
 		auto pipeline_state = dx.fog_pipeline_states[tess.shader->fogPass - 1][tess.shader->cullType][tess.shader->polygonOffset];
-		dx_shade_geometry(pipeline_state, false, Vk_Depth_Range::normal);
+		dx_shade_geometry(pipeline_state, false, Vk_Depth_Range::normal, true, false);
 	}
 }
 
@@ -850,7 +864,7 @@ static void RB_IterateStagesGeneric( shaderCommands_t *input )
 				depth_range = Vk_Depth_Range::weapon;
 			}
 
-			dx_shade_geometry(pipeline_state, multitexture, depth_range);
+			dx_shade_geometry(pipeline_state, multitexture, depth_range, true, false);
 		}
 
 		// allow skipping out to show just lightmaps during development
diff --git a/src/engine/renderer/tr_shadows.c b/src/engine/renderer/tr_shadows.c
index 67ad089..b8738c3 100644
--- a/src/engine/renderer/tr_shadows.c
+++ b/src/engine/renderer/tr_shadows.c
@@ -150,7 +150,7 @@ static void R_Vk_Dx_RenderShadowEdges(VkPipeline vk_pipeline, ID3D12PipelineStat
 		}
 		if (dx.active) {
 			dx_bind_geometry();
-			dx_shade_geometry(dx_pipeline_state, false, Vk_Depth_Range::normal);
+			dx_shade_geometry(dx_pipeline_state, false, Vk_Depth_Range::normal, true, false);
 		}
 
 		i += count;
@@ -354,7 +354,7 @@ void RB_ShadowFinish( void ) {
 		}
 		if (dx.active) {
 			dx_bind_geometry();
-			dx_shade_geometry(dx.shadow_finish_pipeline_state, false, Vk_Depth_Range::normal);
+			dx_shade_geometry(dx.shadow_finish_pipeline_state, false, Vk_Depth_Range::normal, true, false);
 		}
 
 		Com_Memcpy(vk_world.modelview_transform, tmp, 64);
diff --git a/src/engine/renderer/tr_sky.c b/src/engine/renderer/tr_sky.c
index d51a9e1..0e0a1ba 100644
--- a/src/engine/renderer/tr_sky.c
+++ b/src/engine/renderer/tr_sky.c
@@ -501,7 +501,7 @@ static void DrawSkyBox( shader_t *shader )
 			}
 			if (dx.active) {
 				dx_bind_geometry();
-				dx_shade_geometry(dx.skybox_pipeline_state, false, r_showsky->integer ? Vk_Depth_Range::force_zero : Vk_Depth_Range::force_one);
+				dx_shade_geometry(dx.skybox_pipeline_state, false, r_showsky->integer ? Vk_Depth_Range::force_zero : Vk_Depth_Range::force_one, true, false);
 			}
 		}
 	}