HDR output (outdated)

engine/common/cvar.c

@@ -510,7 +510,8 @@ void Cvar_DirectSet( convar_t *var, const char *value )
 	if( var != Cvar_FindVar( var->name ))
 		return; // how this possible?
 
-	if( FBitSet( var->flags, FCVAR_READ_ONLY|FCVAR_GLCONFIG ))
+	//if( FBitSet( var->flags, FCVAR_READ_ONLY|FCVAR_GLCONFIG ))
+	if( FBitSet( var->flags, FCVAR_READ_ONLY )) // TODO: fix order VK init render or fix this GL-eccentric
 	{
 		Con_Printf( "%s is read-only.\n", var->name );
 		return;

ref_vk/vk_cvar.c

@@ -1,5 +1,6 @@
 #include "vk_cvar.h"
 #include "vk_common.h"
+#include "vk_render.h"
 
 #define NONEXTERN_CVAR(cvar) cvar_t *cvar;
 DECLARE_CVAR(NONEXTERN_CVAR)
@@ -19,5 +20,11 @@ void VK_LoadCvars( void )
 	vk_rtx_light_end = gEngine.Cvar_Get( "vk_rtx_light_end", "0", 0, "DEBUG: disable lights with index higher than this ");
 	r_lightmap = gEngine.Cvar_Get( "r_lightmap", "0", FCVAR_CHEAT, "lightmap debugging tool" );
 	ui_infotool = gEngine.Cvar_Get( "ui_infotool", "0", FCVAR_CHEAT, "DEBUG: print entity info under crosshair" );
-	vk_rtx = gEngine.Cvar_Get( "vk_rtx", "1", FCVAR_ARCHIVE, "Enable or disable ray tracing mode" );
+	vk_rtx_extension = gEngine.Cvar_Get( "vk_rtx_extension", vk_core.rtx ? "1" : "0", FCVAR_READ_ONLY, "" );
+	if (vk_core.rtx) {
+		vk_rtx = gEngine.Cvar_Get( "vk_rtx", "1", FCVAR_GLCONFIG, "Enable or disable Ray Tracing mode" );
+	} else {
+		vk_rtx = gEngine.Cvar_Get( "vk_rtx", "0", FCVAR_READ_ONLY, "DISABLED: not supported without -rtx" );
+	}
+	vk_hdr = gEngine.Cvar_Get( "vk_hdr", "0", FCVAR_GLCONFIG, "Enable or disable High Dynamic Range output (RESTART REQUIRED)" );
 }

ref_vk/vk_cvar.h

@@ -2,6 +2,9 @@
 
 #include "cvardef.h"
 
+// from engine/common/cvar.h
+#define FCVAR_READ_ONLY		(1<<17)	// cannot be set by user at all, and can't be requested by CvarGetPointer from game dlls
+
 #define CVAR_TO_BOOL( x )		((x) && ((x)->value != 0.0f) ? true : false )
 
 void VK_LoadCvars( void );
@@ -16,6 +19,8 @@ void VK_LoadCvars( void );
 	X(r_lightmap) \
 	X(ui_infotool) \
 	X(vk_rtx) \
+	X(vk_rtx_extension) \
+	X(vk_hdr) \
 
 #define EXTERN_CVAR(cvar) extern cvar_t *cvar;
 DECLARE_CVAR(EXTERN_CVAR)

ref_vk/vk_framectl.c

@@ -132,11 +132,11 @@ static void destroyDepthImage( void ) {
 	freeDeviceMemory(&g_frame.depth.device_memory);
 }
 
-static VkRenderPass createRenderPass( qboolean ray_tracing ) {
+static VkRenderPass createRenderPass( qboolean ray_tracing, qboolean hdr_output ) {
 	VkRenderPass render_pass;
 
 	VkAttachmentDescription attachments[] = {{
-		.format = VK_FORMAT_B8G8R8A8_UNORM, //SRGB,// FIXME too early swapchain.create_info.imageFormat;
+		.format = hdr_output ? VK_FORMAT_A2B10G10R10_UNORM_PACK32 : VK_FORMAT_B8G8R8A8_UNORM, //SRGB,// FIXME too early swapchain.create_info.imageFormat;
 		.samples = VK_SAMPLE_COUNT_1_BIT,
 		.loadOp = ray_tracing ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_CLEAR /* TODO: prod renderer should not care VK_ATTACHMENT_LOAD_OP_DONT_CARE */,
 		.storeOp = VK_ATTACHMENT_STORE_OP_STORE,
@@ -213,6 +213,8 @@ static qboolean createSwapchain( void )
 	// recreating swapchain means invalidating any previous frames
 	g_frame.last_frame_index = -1;
 
+	qboolean hdr_output = CVAR_TO_BOOL( vk_hdr );
+
 	XVK_CHECK(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_core.physical_device.device, vk_core.surface.surface, &g_frame.surface_caps));
 
 	vk_frame.width = g_frame.surface_caps.currentExtent.width;
@@ -230,8 +232,8 @@ static qboolean createSwapchain( void )
 	create_info->sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR;
 	create_info->pNext = NULL;
 	create_info->surface = vk_core.surface.surface;
-	create_info->imageFormat = VK_FORMAT_B8G8R8A8_UNORM;//SRGB; // TODO get from surface_formats
-	create_info->imageColorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; // TODO get from surface_formats
+	create_info->imageFormat = hdr_output ? VK_FORMAT_A2B10G10R10_UNORM_PACK32 : VK_FORMAT_B8G8R8A8_UNORM;//SRGB; // TODO get from surface_formats
+	create_info->imageColorSpace = hdr_output ? VK_COLOR_SPACE_HDR10_ST2084_EXT : VK_COLORSPACE_SRGB_NONLINEAR_KHR; // TODO get from surface_formats
 	create_info->imageExtent.width = vk_frame.width;
 	create_info->imageExtent.height = vk_frame.height;
 	create_info->imageArrayLayers = 1;
@@ -315,6 +317,7 @@ void R_BeginFrame( qboolean clearScene )
 	if (vk_core.rtx && FBitSet( vk_rtx->flags, FCVAR_CHANGED )) {
 		g_frame.rtx_enabled = CVAR_TO_BOOL( vk_rtx );
 	}
+	ClearBits( vk_rtx->flags, FCVAR_CHANGED );
 	{
 		gEngine.Con_NPrintf(5, "Perf scopes:");
 		for (int i = 0; i < g_aprof.num_scopes; ++i) {
@@ -345,6 +348,14 @@ void R_BeginFrame( qboolean clearScene )
 		}
 	}
 
+	// TODO: VkFramebufferCreateInfo attachment #0 has format of VK_FORMAT_A2B10G10R10_UNORM_PACK32 that does not match the format of VK_FORMAT_B8G8R8A8_UNORM used by the corresponding attachment for VkRenderPass
+	/*
+	if (FBitSet( vk_hdr->flags, FCVAR_CHANGED )) {
+		createSwapchain();
+	}
+	ClearBits( vk_hdr->flags, FCVAR_CHANGED );
+	*/
+
 	for (int i = 0;; ++i)
 	{
 		const VkResult acquire_result = vkAcquireNextImageKHR(vk_core.device, g_frame.swapchain, UINT64_MAX, g_frame.image_available,
@@ -511,15 +522,17 @@ void R_EndFrame( void )
 static void toggleRaytracing( void ) {
 	ASSERT(vk_core.rtx);
 	g_frame.rtx_enabled = !g_frame.rtx_enabled;
+	gEngine.Cvar_Set("vk_rtx", g_frame.rtx_enabled ? "1" : "0");
 	gEngine.Con_Printf(S_WARN "Switching ray tracing to %d\n", g_frame.rtx_enabled);
 }
 
 qboolean VK_FrameCtlInit( void )
 {
 	PROFILER_SCOPES(APROF_SCOPE_INIT);
-	vk_frame.render_pass.raster = createRenderPass(false);
+	qboolean hdr_output = CVAR_TO_BOOL( vk_hdr );
+	vk_frame.render_pass.raster = createRenderPass(false, hdr_output);
 	if (vk_core.rtx)
-		vk_frame.render_pass.after_ray_tracing = createRenderPass(true);
+		vk_frame.render_pass.after_ray_tracing = createRenderPass(true, hdr_output);
 
 	if (!createSwapchain())
 		return false;
@@ -762,7 +775,7 @@ static rgbdata_t *XVK_ReadPixels( void ) {
 			r_shot->buffer = Mem_Malloc( r_temppool, r_shot->size );
 
 			if (!blit) {
-				if (dest_format != VK_FORMAT_R8G8B8A8_UNORM || g_frame.create_info.imageFormat != VK_FORMAT_B8G8R8A8_UNORM) {
+				if (dest_format != VK_FORMAT_R8G8B8A8_UNORM || g_frame.create_info.imageFormat != VK_FORMAT_B8G8R8A8_UNORM) { // TODO: fix for HDR
 					gEngine.Con_Printf(S_WARN "Don't have a blit function for this format pair, will save as-is w/o conversion; expect image to look wrong\n");
 					blit = true;
 				} else {