BramReuling/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-05 22:30:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve implementation of GetClosestSupportedFormat

Browse source
This commit is contained in:
Cameron Cawley 2026-05-13 22:23:20 +01:00
parent 6c55fad411
commit 857e87973f
1 changed files with 48 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/render/SDL_render.c
View file

@ -1441,7 +1441,7 @@ static bool IsSupportedFormat(SDL_Renderer *renderer, SDL_PixelFormat format)
return false; return false;
} }
static SDL_PixelFormat GetClosestSupportedFormat(SDL_Renderer *renderer, SDL_PixelFormat format) static SDL_PixelFormat GetClosestSupportedFormat(SDL_Renderer *renderer, SDL_PixelFormat format, bool hasAlpha)
{ {
int i; int i;
@ -1477,21 +1477,39 @@ static SDL_PixelFormat GetClosestSupportedFormat(SDL_Renderer *renderer, SDL_Pix
return renderer->texture_formats[i]; return renderer->texture_formats[i];
} }
} }
} else if (SDL_ISPIXELFORMAT_INDEXED(format)) {
for (i = 0; i < renderer->num_texture_formats; ++i) {
// Converting between <8bpp formats is not supported yet
if (renderer->texture_formats[i] == SDL_PIXELFORMAT_INDEX8) {
return renderer->texture_formats[i];
}
}
} else { } else {
bool hasAlpha = SDL_ISPIXELFORMAT_ALPHA(format); int type = SDL_PIXELTYPE(format);
bool isIndexed = SDL_ISPIXELFORMAT_INDEXED(format); int layout = SDL_PIXELLAYOUT(format);
int size = SDL_BYTESPERPIXEL(format); hasAlpha = hasAlpha || SDL_ISPIXELFORMAT_ALPHA(format);
// We just want to match the first format that has the same channels // We just want to match the first format that has the same channels
for (i = 0; i < renderer->num_texture_formats; ++i) { for (i = 0; i < renderer->num_texture_formats; ++i) {
if (!SDL_ISPIXELFORMAT_FOURCC(renderer->texture_formats[i]) && if (!SDL_ISPIXELFORMAT_FOURCC(renderer->texture_formats[i]) &&
SDL_BYTESPERPIXEL(renderer->texture_formats[i]) == size && SDL_PIXELTYPE(renderer->texture_formats[i]) == type &&
SDL_ISPIXELFORMAT_ALPHA(renderer->texture_formats[i]) == hasAlpha && SDL_PIXELLAYOUT(renderer->texture_formats[i]) == layout &&
SDL_ISPIXELFORMAT_INDEXED(renderer->texture_formats[i]) == isIndexed) { SDL_ISPIXELFORMAT_ALPHA(renderer->texture_formats[i]) == hasAlpha) {
return renderer->texture_formats[i]; return renderer->texture_formats[i];
} }
} }
} }
if (hasAlpha) {
// The default format may still lack an alpha channel
for (i = 0; i < renderer->num_texture_formats; ++i) {
if (!SDL_ISPIXELFORMAT_FOURCC(renderer->texture_formats[i]) &&
SDL_ISPIXELFORMAT_ALPHA(renderer->texture_formats[i])) {
return renderer->texture_formats[i];
}
}
}
return renderer->texture_formats[0]; return renderer->texture_formats[0];
} }
@ -1585,7 +1603,7 @@ SDL_Texture *SDL_CreateTextureWithProperties(SDL_Renderer *renderer, SDL_Propert
SDL_PropertiesID native_props = SDL_CreateProperties(); SDL_PropertiesID native_props = SDL_CreateProperties();
if (!texture_is_fourcc_and_target) { if (!texture_is_fourcc_and_target) {
closest_format = GetClosestSupportedFormat(renderer, format); closest_format = GetClosestSupportedFormat(renderer, format, false);
} else { } else {
closest_format = renderer->texture_formats[0]; closest_format = renderer->texture_formats[0];
} }
@ -1701,7 +1719,10 @@ static bool SDL_UpdateTextureFromSurface(SDL_Texture *texture, SDL_Rect *rect, S
if (surface->format == texture->format && if (surface->format == texture->format &&
SDL_GetSurfaceColorspace(surface) == texture->colorspace) { SDL_GetSurfaceColorspace(surface) == texture->colorspace) {
if (SDL_ISPIXELFORMAT_ALPHA(surface->format) && SDL_SurfaceHasColorKey(surface)) { if (SDL_ISPIXELFORMAT_INDEXED(surface->format)) {
// Update Texture directly - the color key is handled later
direct_update = true;
} else if (SDL_ISPIXELFORMAT_ALPHA(surface->format) && SDL_SurfaceHasColorKey(surface)) {
/* Surface and Renderer formats are identical. /* Surface and Renderer formats are identical.
* Intermediate conversion is needed to convert color key to alpha (SDL_ConvertColorkeyToAlpha()). */ * Intermediate conversion is needed to convert color key to alpha (SDL_ConvertColorkeyToAlpha()). */
direct_update = false; direct_update = false;
@ -1734,7 +1755,7 @@ static bool SDL_UpdateTextureFromSurface(SDL_Texture *texture, SDL_Rect *rect, S
} }
} }
if (texture->format == surface->format && surface->palette) { if (SDL_ISPIXELFORMAT_INDEXED(texture->format) && surface->palette) {
// Copy the palette to the new texture // Copy the palette to the new texture
SDL_Palette *existing = surface->palette; SDL_Palette *existing = surface->palette;
SDL_Palette *palette = SDL_CreatePalette(existing->ncolors); SDL_Palette *palette = SDL_CreatePalette(existing->ncolors);
@ -1749,6 +1770,20 @@ static bool SDL_UpdateTextureFromSurface(SDL_Texture *texture, SDL_Rect *rect, S
} }
} }
if (SDL_ISPIXELFORMAT_INDEXED(texture->format) && SDL_SurfaceHasColorKey(surface)) {
Uint32 key;
SDL_Color col;
SDL_Palette *palette;
palette = SDL_GetTexturePalette(texture);
if (!palette || !SDL_GetSurfaceColorKey(surface, &key) || (Uint32)palette->ncolors <= key)
return false;
col = palette->colors[key];
col.a = SDL_ALPHA_TRANSPARENT;
SDL_SetPaletteColors(palette, &col, key, 1);
}
{ {
Uint8 r, g, b, a; Uint8 r, g, b, a;
SDL_BlendMode blendMode; SDL_BlendMode blendMode;
@ -1822,38 +1857,9 @@ SDL_Texture *SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *s
} }
} }
// Look for 10-bit pixel formats if needed
if (format == SDL_PIXELFORMAT_UNKNOWN && SDL_ISPIXELFORMAT_10BIT(surface->format)) {
for (i = 0; i < renderer->num_texture_formats; ++i) {
if (SDL_ISPIXELFORMAT_10BIT(renderer->texture_formats[i])) {
format = renderer->texture_formats[i];
break;
}
}
}
// Look for floating point pixel formats if needed
if (format == SDL_PIXELFORMAT_UNKNOWN &&
(SDL_ISPIXELFORMAT_10BIT(surface->format) || SDL_ISPIXELFORMAT_FLOAT(surface->format))) {
for (i = 0; i < renderer->num_texture_formats; ++i) {
if (SDL_ISPIXELFORMAT_FLOAT(renderer->texture_formats[i])) {
format = renderer->texture_formats[i];
break;
}
}
}
// Fallback, choose a valid pixel format // Fallback, choose a valid pixel format
if (format == SDL_PIXELFORMAT_UNKNOWN) { if (format == SDL_PIXELFORMAT_UNKNOWN) {
format = renderer->texture_formats[0]; bool needAlpha = SDL_SurfaceHasColorKey(surface);
// See what the best texture format is
bool needAlpha;
if (SDL_ISPIXELFORMAT_ALPHA(surface->format) || SDL_SurfaceHasColorKey(surface)) {
needAlpha = true;
} else {
needAlpha = false;
}
// If palette contains alpha values, promotes to alpha format // If palette contains alpha values, promotes to alpha format
if (surface->palette) { if (surface->palette) {
@ -1864,19 +1870,7 @@ SDL_Texture *SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *s
} }
} }
// Indexed formats don't support the transparency needed for color-keyed surfaces format = GetClosestSupportedFormat(renderer, surface->format, needAlpha);
bool preferIndexed = SDL_ISPIXELFORMAT_INDEXED(surface->format) && !needAlpha;
int size = SDL_BYTESPERPIXEL(format);
for (i = 0; i < renderer->num_texture_formats; ++i) {
if (!SDL_ISPIXELFORMAT_FOURCC(renderer->texture_formats[i]) &&
SDL_BYTESPERPIXEL(renderer->texture_formats[i]) == size &&
SDL_ISPIXELFORMAT_ALPHA(renderer->texture_formats[i]) == needAlpha &&
SDL_ISPIXELFORMAT_INDEXED(renderer->texture_formats[i]) == preferIndexed) {
format = renderer->texture_formats[i];
break;
}
}
} }
surface_colorspace = SDL_GetSurfaceColorspace(surface); surface_colorspace = SDL_GetSurfaceColorspace(surface);
@ -1906,7 +1900,7 @@ SDL_Texture *SDL_CreateTextureFromSurface(SDL_Renderer *renderer, SDL_Surface *s
SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER, surface->w); SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_WIDTH_NUMBER, surface->w);
SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_HEIGHT_NUMBER, surface->h); SDL_SetNumberProperty(props, SDL_PROP_TEXTURE_CREATE_HEIGHT_NUMBER, surface->h);
texture = SDL_CreateTextureWithProperties(renderer, props); texture = SDL_CreateTextureWithProperties(renderer, props);
SDL_DestroyProperties(props); SDL_DestroyProperties(props);
if (!texture) { if (!texture) {
return NULL; return NULL;