Scarfski/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-11-14 20:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Vulkan HDR10, fixed D3D11/D3D12 HDR10 color space, and ImGui colors in HDR10. (#4061)

Browse Source
This commit is contained in:
Branimir Karadžić
2026-10-17 09:57:27 -07:00
committed by GitHub
parent 227eac0d75
commit fe3f08fb0e
22 changed files with 2020 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer_vk.cpp
+41 -3
View File
@@ -390,6 +390,7 @@ VK_IMPORT_DEVICE
EXT_memory_budget,
EXT_shader_viewport_index_layer,
EXT_surface_maintenance1,
EXT_swapchain_colorspace,
EXT_swapchain_maintenance1,
KHR_16bit_storage,
KHR_draw_indirect_count,
@@ -442,6 +443,7 @@ VK_IMPORT_DEVICE
{ "VK_EXT_memory_budget", 1, false, false, true, Layer::Count },
{ "VK_EXT_shader_viewport_index_layer", 1, false, false, true, Layer::Count },
{ "VK_EXT_surface_maintenance1", 1, false, false, true, Layer::Count },
{ "VK_EXT_swapchain_colorspace", 1, false, false, true, Layer::Count },
{ "VK_EXT_swapchain_maintenance1", 1, false, false, true, Layer::Count },
{ "VK_KHR_16bit_storage", 1, false, false, true, Layer::Count },
{ "VK_KHR_draw_indirect_count", 1, false, false, true, Layer::Count },
@@ -1108,6 +1110,14 @@ VK_IMPORT_DEVICE
;
}
VkColorSpaceKHR getHdr10ColorSpace(TextureFormat::Enum _format)
{
return TextureFormat::RGB10A2 == _format ? VK_COLOR_SPACE_HDR10_ST2084_EXT
: TextureFormat::RGBA16F == _format ? VK_COLOR_SPACE_EXTENDED_SRGB_LINEAR_EXT
: VK_COLOR_SPACE_SRGB_NONLINEAR_KHR
;
}
void setImageMemoryBarrier(
VkCommandBuffer _commandBuffer
, VkImage _image
@@ -2471,6 +2481,22 @@ VK_IMPORT_DEVICE
{
const VkSurfaceFormatKHR& surfaceFormat = surfaceFormats[sfidx];
static const TextureFormat::Enum hdr10Formats[] =
{
TextureFormat::RGB10A2,
TextureFormat::RGBA16F,
};
for (TextureFormat::Enum format : hdr10Formats)
{
if (s_extension[Extension::EXT_swapchain_colorspace].m_supported
&& surfaceFormat.format == s_textureFormat[format].m_fmt
&& surfaceFormat.colorSpace == getHdr10ColorSpace(format) )
{
g_caps.supported |= BGFX_CAPS_HDR10;
}
}
for (uint32_t ii = TextureFormat::Unknown+1; ii < TextureFormat::UnknownDepth; ++ii)
{
if (0 != (g_caps.formats[ii] & BGFX_CAPS_FORMAT_TEXTURE_BACKBUFFER) )
@@ -8926,7 +8952,7 @@ VK_DESTROY
const VkPhysicalDevice physicalDevice = s_renderVK->m_physicalDevice;
const uint64_t recreateSurfaceMask = BGFX_SWAP_CHAIN_HIDPI;
const uint64_t recreateSwapchainMask = BGFX_SWAP_CHAIN_SRGB_BACKBUFFER;
const uint64_t recreateSwapchainMask = BGFX_SWAP_CHAIN_SRGB_BACKBUFFER | BGFX_SWAP_CHAIN_HDR10;
const uint64_t recreateAttachmentsMask = BGFX_SWAP_CHAIN_MSAA_MASK;
const bool vsync = !!(s_renderVK->m_reset & BGFX_RESET_VSYNC);
@@ -9263,9 +9289,21 @@ VK_DESTROY
const uint32_t swapBufferCount = bx::clamp<uint32_t>(m_desc.numBackBuffers, minSwapBufferCount, maxSwapBufferCount);
const VkColorSpaceKHR surfaceColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR;
const bool srgb = !!(m_desc.flags & BGFX_SWAP_CHAIN_SRGB_BACKBUFFER);
const VkColorSpaceKHR hdr10ColorSpace = getHdr10ColorSpace(m_desc.formatColor);
const bool hdr10 = true
&& 0 != (m_desc.flags & BGFX_SWAP_CHAIN_HDR10)
&& s_extension[Extension::EXT_swapchain_colorspace].m_supported
&& VK_COLOR_SPACE_SRGB_NONLINEAR_KHR != hdr10ColorSpace
&& m_desc.formatColor == findSurfaceFormat(m_desc.formatColor, hdr10ColorSpace, srgb)
;
const VkColorSpaceKHR surfaceColorSpace = hdr10
? hdr10ColorSpace
: VK_COLOR_SPACE_SRGB_NONLINEAR_KHR
;
m_colorFormat = findSurfaceFormat(m_desc.formatColor, surfaceColorSpace, srgb);
m_depthFormat = bgfx::TextureFormat::UnknownDepth;