eden-emu/SDL
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Convert to sRGB if trying to create a texture from an HDR surface

Browse source
This commit is contained in:
Sam Lantinga 2024-02-01 10:30:58 -08:00
parent c1f3c81003
commit fc35b7e121
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/render/SDL_render.c
View file

@ -1351,6 +1351,10 @@ SDL_Texture *SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *s
} }
} }
if (SDL_GetSurfaceColorspace(surface, &colorspace) < 0) {
return NULL;
}
/* Try to have the best pixel format for the texture */ /* Try to have the best pixel format for the texture */
/* No alpha, but a colorkey => promote to alpha */ /* No alpha, but a colorkey => promote to alpha */
if (!fmt->Amask && SDL_SurfaceHasColorKey(surface)) { if (!fmt->Amask && SDL_SurfaceHasColorKey(surface)) {
@ -1405,8 +1409,10 @@ SDL_Texture *SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *s
direct_update = SDL_FALSE; direct_update = SDL_FALSE;
} }
if (SDL_GetSurfaceColorspace(surface, &colorspace) < 0) { if ((SDL_COLORSPACETRANSFER(colorspace) == SDL_TRANSFER_CHARACTERISTICS_PQ && !SDL_ISPIXELFORMAT_10BIT(format)) ||
return NULL; (colorspace == SDL_COLORSPACE_SCRGB && !SDL_ISPIXELFORMAT_FLOAT(format))) {
/* Need to do SDR conversion */
colorspace = SDL_COLORSPACE_SRGB;
} }
props = SDL_CreateProperties(); props = SDL_CreateProperties();
@ -1429,17 +1435,10 @@ SDL_Texture *SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *s
SDL_UpdateTexture(texture, NULL, surface->pixels, surface->pitch); SDL_UpdateTexture(texture, NULL, surface->pixels, surface->pitch);
} }
} else { } else {
SDL_PixelFormat *dst_fmt;
SDL_Surface *temp = NULL; SDL_Surface *temp = NULL;
/* Set up a destination surface for the texture update */ /* Set up a destination surface for the texture update */
dst_fmt = SDL_CreatePixelFormat(format); temp = SDL_ConvertSurfaceFormatAndColorspace(surface, format, colorspace);
if (!dst_fmt) {
SDL_DestroyTexture(texture);
return NULL;
}
temp = SDL_ConvertSurface(surface, dst_fmt);
SDL_DestroyPixelFormat(dst_fmt);
if (temp) { if (temp) {
SDL_UpdateTexture(texture, NULL, temp->pixels, temp->pitch); SDL_UpdateTexture(texture, NULL, temp->pixels, temp->pitch);
SDL_DestroySurface(temp); SDL_DestroySurface(temp);