From 86e393b5235ea2a1e23c1a9e08714e3a0e1478f0 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 11 Sep 2024 11:53:23 -0700 Subject: [PATCH] Clarify that INPUTTYPE_UNSPECIFIED is correct for RGB textures --- src/render/direct3d11/SDL_render_d3d11.c | 7 ++++--- src/render/direct3d12/SDL_render_d3d12.c | 7 ++++--- src/render/vulkan/SDL_render_vulkan.c | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c index e0ff88976e..2bb829e046 100644 --- a/src/render/direct3d11/SDL_render_d3d11.c +++ b/src/render/direct3d11/SDL_render_d3d11.c @@ -243,7 +243,7 @@ SDL_PixelFormat D3D11_DXGIFormatToSDLPixelFormat(DXGI_FORMAT dxgiFormat) } } -static DXGI_FORMAT SDLPixelFormatToDXGITextureFormat(Uint32 format, Uint32 colorspace) +static DXGI_FORMAT SDLPixelFormatToDXGITextureFormat(Uint32 format, Uint32 output_colorspace) { switch (format) { case SDL_PIXELFORMAT_RGBA64_FLOAT: @@ -251,12 +251,12 @@ static DXGI_FORMAT SDLPixelFormatToDXGITextureFormat(Uint32 format, Uint32 color case SDL_PIXELFORMAT_XBGR2101010: return DXGI_FORMAT_R10G10B10A2_UNORM; case SDL_PIXELFORMAT_ARGB8888: - if (colorspace == SDL_COLORSPACE_SRGB_LINEAR) { + if (output_colorspace == SDL_COLORSPACE_SRGB_LINEAR) { return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; } return DXGI_FORMAT_B8G8R8A8_UNORM; case SDL_PIXELFORMAT_XRGB8888: - if (colorspace == SDL_COLORSPACE_SRGB_LINEAR) { + if (output_colorspace == SDL_COLORSPACE_SRGB_LINEAR) { return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; } return DXGI_FORMAT_B8G8R8X8_UNORM; @@ -2124,6 +2124,7 @@ static void D3D11_SetupShaderConstants(SDL_Renderer *renderer, const SDL_RenderC } else if (texture->colorspace == SDL_COLORSPACE_HDR10) { constants->input_type = INPUTTYPE_HDR10; } else { + // The sampler will convert from sRGB to linear on load if working in linear colorspace constants->input_type = INPUTTYPE_UNSPECIFIED; } break; diff --git a/src/render/direct3d12/SDL_render_d3d12.c b/src/render/direct3d12/SDL_render_d3d12.c index 054a3d60a9..f444505f9e 100644 --- a/src/render/direct3d12/SDL_render_d3d12.c +++ b/src/render/direct3d12/SDL_render_d3d12.c @@ -310,7 +310,7 @@ static SDL_PixelFormat D3D12_DXGIFormatToSDLPixelFormat(DXGI_FORMAT dxgiFormat) } } -static DXGI_FORMAT SDLPixelFormatToDXGITextureFormat(Uint32 format, Uint32 colorspace) +static DXGI_FORMAT SDLPixelFormatToDXGITextureFormat(Uint32 format, Uint32 output_colorspace) { switch (format) { case SDL_PIXELFORMAT_RGBA64_FLOAT: @@ -318,12 +318,12 @@ static DXGI_FORMAT SDLPixelFormatToDXGITextureFormat(Uint32 format, Uint32 color case SDL_PIXELFORMAT_XBGR2101010: return DXGI_FORMAT_R10G10B10A2_UNORM; case SDL_PIXELFORMAT_ARGB8888: - if (colorspace == SDL_COLORSPACE_SRGB_LINEAR) { + if (output_colorspace == SDL_COLORSPACE_SRGB_LINEAR) { return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; } return DXGI_FORMAT_B8G8R8A8_UNORM; case SDL_PIXELFORMAT_XRGB8888: - if (colorspace == SDL_COLORSPACE_SRGB_LINEAR) { + if (output_colorspace == SDL_COLORSPACE_SRGB_LINEAR) { return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; } return DXGI_FORMAT_B8G8R8X8_UNORM; @@ -2554,6 +2554,7 @@ static void D3D12_SetupShaderConstants(SDL_Renderer *renderer, const SDL_RenderC } else if (texture->colorspace == SDL_COLORSPACE_HDR10) { constants->input_type = INPUTTYPE_HDR10; } else { + // The sampler will convert from sRGB to linear on load if working in linear colorspace constants->input_type = INPUTTYPE_UNSPECIFIED; } break; diff --git a/src/render/vulkan/SDL_render_vulkan.c b/src/render/vulkan/SDL_render_vulkan.c index 2bd6e53122..83b1a057bd 100644 --- a/src/render/vulkan/SDL_render_vulkan.c +++ b/src/render/vulkan/SDL_render_vulkan.c @@ -426,7 +426,7 @@ static VkDeviceSize VULKAN_GetBytesPerPixel(VkFormat vkFormat) } } -static VkFormat SDLPixelFormatToVkTextureFormat(Uint32 format, Uint32 colorspace) +static VkFormat SDLPixelFormatToVkTextureFormat(Uint32 format, Uint32 output_colorspace) { switch (format) { case SDL_PIXELFORMAT_RGBA64_FLOAT: @@ -435,7 +435,7 @@ static VkFormat SDLPixelFormatToVkTextureFormat(Uint32 format, Uint32 colorspace return VK_FORMAT_A2B10G10R10_UNORM_PACK32; case SDL_PIXELFORMAT_ARGB8888: case SDL_PIXELFORMAT_XRGB8888: - if (colorspace == SDL_COLORSPACE_SRGB_LINEAR) { + if (output_colorspace == SDL_COLORSPACE_SRGB_LINEAR) { return VK_FORMAT_B8G8R8A8_SRGB; } return VK_FORMAT_B8G8R8A8_UNORM; @@ -3282,6 +3282,7 @@ static void VULKAN_SetupShaderConstants(SDL_Renderer *renderer, const SDL_Render SDL_COLORSPACETRANSFER(texture->colorspace) == SDL_TRANSFER_CHARACTERISTICS_PQ) { constants->input_type = INPUTTYPE_HDR10; } else { + // The sampler will convert from sRGB to linear on load if working in linear colorspace constants->input_type = INPUTTYPE_UNSPECIFIED; } break;