zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-17 17:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fully enable vk_hdr as a feature since it works now after the queue family selection was improved

Browse source
This commit is contained in:
Magnus Norddahl 2019-03-25 01:39:27 +01:00
parent 954b72915c
commit c010c5e818
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rendering/vulkan/renderer/vk_postprocess.cpp
View file

@ -195,6 +195,11 @@ void VkPostprocess::DrawPresentTexture(const IntRect &box, bool applyGamma, bool
uniforms.Scale = { screen->mScreenViewport.width / (float)fb->GetBuffers()->GetWidth(), -screen->mScreenViewport.height / (float)fb->GetBuffers()->GetHeight() }; uniforms.Scale = { screen->mScreenViewport.width / (float)fb->GetBuffers()->GetWidth(), -screen->mScreenViewport.height / (float)fb->GetBuffers()->GetHeight() };
uniforms.Offset = { 0.0f, 1.0f }; uniforms.Offset = { 0.0f, 1.0f };
if (applyGamma && fb->swapChain->swapChainFormat.colorSpace == VK_COLOR_SPACE_HDR10_ST2084_EXT)
{
uniforms.InvGamma *= 2.2f;
}
VkPPRenderState renderstate; VkPPRenderState renderstate;
renderstate.Shader = &hw_postprocess.present.Present; renderstate.Shader = &hw_postprocess.present.Present;
renderstate.Uniforms.Set(uniforms); renderstate.Uniforms.Set(uniforms);

18
src/rendering/vulkan/system/vk_swapchain.cpp
View file

@ -5,7 +5,7 @@
EXTERN_CVAR(Bool, vid_vsync); EXTERN_CVAR(Bool, vid_vsync);
CUSTOM_CVAR(Bool, vk_hdr, false, /*CVAR_ARCHIVE | CVAR_GLOBALCONFIG |*/ CVAR_NOINITCALL) CUSTOM_CVAR(Bool, vk_hdr, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
{ {
Printf("This won't take effect until " GAMENAME " is restarted.\n"); Printf("This won't take effect until " GAMENAME " is restarted.\n");
} }
@ -176,20 +176,21 @@ VulkanSwapChain::VulkanSwapChain(VulkanDevice *device) : vsync(vid_vsync), devic
device->SetDebugObjectName("SwapChainImageView", (uint64_t)swapChainImageViews[i], VK_OBJECT_TYPE_IMAGE_VIEW); device->SetDebugObjectName("SwapChainImageView", (uint64_t)swapChainImageViews[i], VK_OBJECT_TYPE_IMAGE_VIEW);
} }
#if 0 // This isn't required it seems
if (swapChainFormat.colorSpace == VK_COLOR_SPACE_HDR10_ST2084_EXT) if (swapChainFormat.colorSpace == VK_COLOR_SPACE_HDR10_ST2084_EXT)
{ {
// Mastering display with DCI-P3 color primaries and D65 white point, // Mastering display with HDR10_ST2084 color primaries and D65 white point,
// maximum luminance of 1000 nits and minimum luminance of 0.001 nits; // maximum luminance of 1000 nits and minimum luminance of 0.001 nits;
// content has maximum luminance of 2000 nits and maximum frame average light level (MaxFALL) of 500 nits. // content has maximum luminance of 2000 nits and maximum frame average light level (MaxFALL) of 500 nits.
VkHdrMetadataEXT metadata = {}; VkHdrMetadataEXT metadata = {};
metadata.sType = VK_STRUCTURE_TYPE_HDR_METADATA_EXT; metadata.sType = VK_STRUCTURE_TYPE_HDR_METADATA_EXT;
metadata.displayPrimaryRed.x = 0.680f; metadata.displayPrimaryRed.x = 0.708f;
metadata.displayPrimaryRed.y = 0.320f; metadata.displayPrimaryRed.y = 0.292f;
metadata.displayPrimaryGreen.x = 0.265f; metadata.displayPrimaryGreen.x = 0.170f;
metadata.displayPrimaryGreen.y = 0.690f; metadata.displayPrimaryGreen.y = 0.797f;
metadata.displayPrimaryBlue.x = 0.150f; metadata.displayPrimaryBlue.x = 0.131f;
metadata.displayPrimaryBlue.y = 0.060f; metadata.displayPrimaryBlue.y = 0.046f;
metadata.whitePoint.x = 0.3127f; metadata.whitePoint.x = 0.3127f;
metadata.whitePoint.y = 0.3290f; metadata.whitePoint.y = 0.3290f;
metadata.maxLuminance = 1000.0f; metadata.maxLuminance = 1000.0f;
@ -199,6 +200,7 @@ VulkanSwapChain::VulkanSwapChain(VulkanDevice *device) : vsync(vid_vsync), devic
vkSetHdrMetadataEXT(device->device, 1, &swapChain, &metadata); vkSetHdrMetadataEXT(device->device, 1, &swapChain, &metadata);
} }
#endif
} }
catch (...) catch (...)
{ {