image and font renderer refactors

Author: turanszkij

WickedEngine/shaders/ShaderInterop.h

@@ -88,7 +88,6 @@ struct IndirectDispatchArgs
 // Common buffers:
 // These are usable by all shaders
 #define CBSLOT_IMAGE							0
-#define CBSLOT_FONT								0
 #define CBSLOT_RENDERER_FRAME					0
 #define CBSLOT_RENDERER_CAMERA					1
 
@@ -116,7 +115,6 @@ struct IndirectDispatchArgs
 #define CBSLOT_RESERVED_PS5_1					1
 
 #define CBSLOT_IMAGE							2
-#define CBSLOT_FONT								2
 #define CBSLOT_RENDERER_FRAME					2
 #define CBSLOT_RENDERER_CAMERA					3
 

WickedEngine/shaders/ShaderInterop_Image.h

@@ -26,11 +26,6 @@ enum IMAGE_FLAGS
 	FONT_FLAG_OUTPUT_COLOR_SPACE_LINEAR = 1u << 18u,
 };
 
-struct FontVertex
-{
-	float2 pos;
-	float2 uv;
-};
 namespace SDF
 {
 	static const uint padding = 5;
@@ -68,9 +63,10 @@ struct alignas(16) ImageConstants
 	uint highlight_xy; // packed half2
 	uint angular_softness_direction; // packed half2
 
-	uint2 softness_bolden_hdrscaling; // packed half3
 	uint angular_softness_mad; // packed half2
 	uint padding0;
+	uint padding1;
+	uint padding2;
 
 	uint2 gradient_color; // packed half4
 	uint gradient_uv_start; // packed half2

WickedEngine/shaders/imageHF.hlsli

@@ -10,10 +10,10 @@ float Wedge2D(float2 v, float2 w)
 
 struct VertextoPixel
 {
-	float4 pos : SV_POSITION;
-	float4 screen : TEXCOORD0;
-	float2 q : TEXCOORD1;
-	float2 edge : TEXCOORD2;
+	float4 pos : SV_Position;
+	float4 screen : SCREENCOORD;
+	float2 q : QUADCOORD;
+	float2 edge : EDGECOORD;
 
 	float2 uv_screen()
 	{

WickedEngine/shaders/imagePS.hlsl

@@ -4,17 +4,18 @@ float4 main(VertextoPixel input) : SV_TARGET
 {
 	half4 color = unpack_half4(image.packed_color);
 
+	const half hdr_scaling = unpack_half2(image.hdr_scaling_aspect).x;
+
 	[branch]
 	if (image.IsFont())
 	{
 		// Font renderer:
 		Texture2D<half4> tex = bindless_textures_half4[descriptor_index(image.texture_base_index)];
 		half value = tex.SampleLevel(sampler_linear_clamp, input.q, 0).r;
 
-		const half3 softness_bolden_hdrscaling = unpack_half3(image.softness_bolden_hdrscaling);
-		const half softness = softness_bolden_hdrscaling.x;
-		const half bolden = softness_bolden_hdrscaling.y;
-		const half hdr_scaling = softness_bolden_hdrscaling.z;
+		const half2 softness_bolden = unpack_half2(image.angular_softness_direction);
+		const half softness = softness_bolden.x;
+		const half bolden = softness_bolden.y;
 
 		[branch]
 		if (image.flags & FONT_FLAG_SDF_RENDERING)
@@ -57,7 +58,6 @@ float4 main(VertextoPixel input) : SV_TARGET
 		// Image renderer:
 		SamplerState sam = bindless_samplers[descriptor_index(image.sampler_index)];
 
-		const half hdr_scaling = unpack_half2(image.hdr_scaling_aspect).x;
 		const half canvas_aspect = unpack_half2(image.hdr_scaling_aspect).y;
 		const half border_soften = unpack_half2(image.bordersoften_saturation).x;
 		const half saturation = unpack_half2(image.bordersoften_saturation).y;

WickedEngine/shaders/imageVS.hlsl

@@ -17,10 +17,10 @@ VertextoPixel main(uint vertexID : SV_VertexID, uint instanceID : SV_InstanceID)
 	{
 		// Font renderer:
 		uint vID = instanceID * 4 + vertexID;
-		FontVertex vertex = bindless_buffers[descriptor_index(image.buffer_index)].Load<FontVertex>(image.buffer_offset + vID * sizeof(FontVertex));
+		const float4 vertex = bindless_buffers[descriptor_index(image.buffer_index)].Load<float4>(image.buffer_offset + vID * sizeof(float4));
 
-		Out.pos = mul(image.transform, float4(asfloat(vertex.pos), 0, 1));
-		Out.q = vertex.uv;
+		Out.pos = mul(image.transform, float4(vertex.xy, 0, 1));
+		Out.q = vertex.zw;
 		switch (vertexID)
 		{
 			default:

WickedEngine/wiFont.cpp

@@ -111,7 +111,7 @@ namespace wi::font
 			bool start_new_word = false;
 		};
 
-		static thread_local wi::vector<FontVertex> vertexList;
+		static thread_local wi::vector<XMFLOAT4> vertexList;
 		ParseStatus ParseText(const wchar_t* text, size_t text_length, const Params& params)
 		{
 			ParseStatus status;
@@ -128,11 +128,11 @@ namespace wi::font
 				if (status.last_word_begin > 0 && params.h_wrap >= 0 && status.cursor.position.x >= params.h_wrap - 1)
 				{
 					// Word ended and wrap detected, push down last word by one line:
-					const float word_offset = vertexList[status.last_word_begin].pos.x;
+					const float word_offset = vertexList[status.last_word_begin].x;
 					for (size_t i = status.last_word_begin; i < status.quadCount * 4; ++i)
 					{
-						vertexList[i].pos.x -= word_offset;
-						vertexList[i].pos.y += linebreak_size;
+						vertexList[i].x -= word_offset;
+						vertexList[i].y += linebreak_size;
 					}
 					status.cursor.position.x -= word_offset;
 					status.cursor.position.y += linebreak_size;
@@ -202,11 +202,6 @@ namespace wi::font
 					const float top = status.cursor.position.y + glyphOffsetY;
 					const float bottom = top + glyphHeight;
 
-					vertexList[vertexID + 0].pos = float2(left, top);
-					vertexList[vertexID + 1].pos = float2(right, top);
-					vertexList[vertexID + 2].pos = float2(left, bottom);
-					vertexList[vertexID + 3].pos = float2(right, bottom);
-
 					float tc_left = glyph.tc_left;
 					float tc_right = glyph.tc_right;
 					float tc_top = glyph.tc_top;
@@ -219,10 +214,11 @@ namespace wi::font
 					{
 						std::swap(tc_top, tc_bottom);
 					}
-					vertexList[vertexID + 0].uv = float2(tc_left, tc_top);
-					vertexList[vertexID + 1].uv = float2(tc_right, tc_top);
-					vertexList[vertexID + 2].uv = float2(tc_left, tc_bottom);
-					vertexList[vertexID + 3].uv = float2(tc_right, tc_bottom);
+
+					vertexList[vertexID + 0] = float4(left, top, tc_left, tc_top);
+					vertexList[vertexID + 1] = float4(right, top, tc_right, tc_top);
+					vertexList[vertexID + 2] = float4(left, bottom, tc_left, tc_bottom);
+					vertexList[vertexID + 3] = float4(right, bottom, tc_right, tc_bottom);
 
 					int advance, lsb;
 					stbtt_GetCodepointHMetrics(&glyph.fontStyle->fontInfo, code, &advance, &lsb);
@@ -259,7 +255,7 @@ namespace wi::font
 
 		void CommitText(void* vertexList_GPU)
 		{
-			std::memcpy(vertexList_GPU, vertexList.data(), sizeof(FontVertex) * vertexList.size());
+			std::memcpy(vertexList_GPU, vertexList.data(), sizeof(XMFLOAT4) * vertexList.size());
 		}
 
 	}
@@ -560,7 +556,7 @@ namespace wi::font
 		M = M * Projection;
 
 		GraphicsDevice* device = wi::graphics::GetDevice();
-		GraphicsDevice::GPUAllocation mem = device->AllocateGPU(sizeof(FontVertex) * status.quadCount * 4, cmd);
+		GraphicsDevice::GPUAllocation mem = device->AllocateGPU(sizeof(float4) * status.quadCount * 4, cmd);
 		if (!mem.IsValid())
 			return status.cursor;
 		CommitText(mem.data);
@@ -612,8 +608,9 @@ namespace wi::font
 			image.packed_color = pack_half4(color);
 			bolden = params.shadow_bolden;
 			softness = params.shadow_softness * 0.5f;
-			image.softness_bolden_hdrscaling = pack_half3(softness, bolden, hdr_scaling);
-			device->BindDynamicConstantBuffer(image, CBSLOT_FONT, cmd);
+			image.hdr_scaling_aspect = pack_half2(hdr_scaling, 0);
+			image.angular_softness_direction = pack_half2(softness, bolden);
+			device->BindDynamicConstantBuffer(image, CBSLOT_IMAGE, cmd);
 
 			device->DrawInstanced(4, status.quadCount, 0, 0, cmd);
 		}
@@ -627,8 +624,9 @@ namespace wi::font
 		image.packed_color = pack_half4(color);
 		bolden = params.bolden;
 		softness = params.softness * 0.5f;
-		image.softness_bolden_hdrscaling = pack_half3(softness, bolden, hdr_scaling);
-		device->BindDynamicConstantBuffer(image, CBSLOT_FONT, cmd);
+		image.hdr_scaling_aspect = pack_half2(hdr_scaling, 0);
+		image.angular_softness_direction = pack_half2(softness, bolden);
+		device->BindDynamicConstantBuffer(image, CBSLOT_IMAGE, cmd);
 
 		device->DrawInstanced(4, status.quadCount, 0, 0, cmd);
 

WickedEngine/wiVersion.cpp

@@ -9,7 +9,7 @@ namespace wi::version
 	// minor features, major updates, breaking compatibility changes
 	const int minor = 72;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 112;
+	const int revision = 113;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);