From b3858ec5f7f173991134efe21e35ad32a6b793ad Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Tue, 5 Mar 2024 15:48:29 -0800 Subject: [PATCH] BT2020_CL is very different from BT2020_NCL, and not currently supported --- include/SDL3/SDL_pixels.h | 2 +- src/render/metal/SDL_render_metal.m | 2 -- src/render/vulkan/SDL_render_vulkan.c | 2 -- src/video/SDL_pixels.c | 2 -- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/SDL3/SDL_pixels.h b/include/SDL3/SDL_pixels.h index ac8f1e07a..868d15951 100644 --- a/include/SDL3/SDL_pixels.h +++ b/include/SDL3/SDL_pixels.h @@ -560,7 +560,7 @@ typedef enum #define SDL_ISCOLORSPACE_YUV_BT601(X) (SDL_COLORSPACEMATRIX(X) == SDL_MATRIX_COEFFICIENTS_BT601 || SDL_COLORSPACEMATRIX(X) == SDL_MATRIX_COEFFICIENTS_BT470BG) #define SDL_ISCOLORSPACE_YUV_BT709(X) (SDL_COLORSPACEMATRIX(X) == SDL_MATRIX_COEFFICIENTS_BT709) -#define SDL_ISCOLORSPACE_YUV_BT2020(X) (SDL_COLORSPACEMATRIX(X) == SDL_MATRIX_COEFFICIENTS_BT2020_NCL || SDL_COLORSPACEMATRIX(X) == SDL_MATRIX_COEFFICIENTS_BT2020_CL) +#define SDL_ISCOLORSPACE_YUV_BT2020(X) (SDL_COLORSPACEMATRIX(X) == SDL_MATRIX_COEFFICIENTS_BT2020_NCL) #define SDL_ISCOLORSPACE_LIMITED_RANGE(X) (SDL_COLORSPACERANGE(X) != SDL_COLOR_RANGE_FULL) #define SDL_ISCOLORSPACE_FULL_RANGE(X) (SDL_COLORSPACERANGE(X) == SDL_COLOR_RANGE_FULL) diff --git a/src/render/metal/SDL_render_metal.m b/src/render/metal/SDL_render_metal.m index cddbfcfb9..bf5db74fa 100644 --- a/src/render/metal/SDL_render_metal.m +++ b/src/render/metal/SDL_render_metal.m @@ -596,9 +596,7 @@ size_t GetYCbCRtoRGBConversionMatrix(SDL_Colorspace colorspace, int w, int h, in case SDL_MATRIX_COEFFICIENTS_BT709: return GetBT709ConversionMatrix(colorspace); - /* FIXME: Are these the same? */ case SDL_MATRIX_COEFFICIENTS_BT2020_NCL: - case SDL_MATRIX_COEFFICIENTS_BT2020_CL: return GetBT2020ConversionMatrix(colorspace); case SDL_MATRIX_COEFFICIENTS_UNSPECIFIED: diff --git a/src/render/vulkan/SDL_render_vulkan.c b/src/render/vulkan/SDL_render_vulkan.c index 08b5c7dc6..d495cd5cc 100644 --- a/src/render/vulkan/SDL_render_vulkan.c +++ b/src/render/vulkan/SDL_render_vulkan.c @@ -2511,9 +2511,7 @@ static int VULKAN_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SD case SDL_MATRIX_COEFFICIENTS_BT709: samplerYcbcrConversionCreateInfo.ycbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_709_KHR; break; - /* FIXME: Are these the same? */ case SDL_MATRIX_COEFFICIENTS_BT2020_NCL: - case SDL_MATRIX_COEFFICIENTS_BT2020_CL: samplerYcbcrConversionCreateInfo.ycbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_2020_KHR; break; case SDL_MATRIX_COEFFICIENTS_UNSPECIFIED: diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c index 9de8dd81a..c321d7ce3 100644 --- a/src/video/SDL_pixels.c +++ b/src/video/SDL_pixels.c @@ -882,9 +882,7 @@ const float *SDL_GetYCbCRtoRGBConversionMatrix(SDL_Colorspace colorspace, int w, case SDL_MATRIX_COEFFICIENTS_BT709: return SDL_GetBT709ConversionMatrix(colorspace); - /* FIXME: Are these the same? */ case SDL_MATRIX_COEFFICIENTS_BT2020_NCL: - case SDL_MATRIX_COEFFICIENTS_BT2020_CL: return SDL_GetBT2020ConversionMatrix(colorspace); case SDL_MATRIX_COEFFICIENTS_UNSPECIFIED: