LOVE/megasource
1
0
Fork 0
mirror of https://github.com/love2d/megasource.git synced 2026-08-17 11:11:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

update SDL3 to latest commit

Browse Source
This commit is contained in:
Sasha Szpakowski
2024-10-06 20:30:44 -03:00
parent 1b0fdc338b
commit 9e5eb1b018
1426 changed files with 242456 additions and 103496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/SDL3/test/testutils.c
+15 -28
View File
@@ -20,28 +20,18 @@
*
* Fails and returns NULL if out of memory.
*/
char *
GetNearbyFilename(const char *file)
char *GetNearbyFilename(const char *file)
{
char *base;
const char *base = SDL_GetBasePath();
char *path;
base = SDL_GetBasePath();
if (base) {
SDL_IOStream *rw;
size_t len = SDL_strlen(base) + SDL_strlen(file) + 1;
path = SDL_malloc(len);
if (!path) {
SDL_free(base);
if (SDL_asprintf(&path, "%s%s", base, file) < 0) {
return NULL;
}
(void)SDL_snprintf(path, len, "%s%s", base, file);
SDL_free(base);
rw = SDL_IOFromFile(path, "rb");
if (rw) {
SDL_CloseIO(rw);
@@ -64,8 +54,7 @@ GetNearbyFilename(const char *file)
*
* Fails and returns NULL if out of memory.
*/
char *
GetResourceFilename(const char *user_specified, const char *def)
char *GetResourceFilename(const char *user_specified, const char *def)
{
if (user_specified) {
return SDL_strdup(user_specified);
@@ -83,9 +72,7 @@ GetResourceFilename(const char *user_specified, const char *def)
*
* If height_out is non-NULL, set it to the texture height.
*/
SDL_Texture *
LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent,
int *width_out, int *height_out)
SDL_Texture *LoadTexture(SDL_Renderer *renderer, const char *file, bool transparent, int *width_out, int *height_out)
{
SDL_Surface *temp = NULL;
SDL_Texture *texture = NULL;
@@ -103,28 +90,28 @@ LoadTexture(SDL_Renderer *renderer, const char *file, SDL_bool transparent,
} else {
/* Set transparent pixel as the pixel at (0,0) */
if (transparent) {
if (temp->format->palette) {
const Uint8 bpp = temp->format->bits_per_pixel;
if (SDL_GetSurfacePalette(temp)) {
const Uint8 bpp = SDL_BITSPERPIXEL(temp->format);
const Uint8 mask = (1 << bpp) - 1;
if (SDL_PIXELORDER(temp->format->format) == SDL_BITMAPORDER_4321)
SDL_SetSurfaceColorKey(temp, SDL_TRUE, (*(Uint8 *)temp->pixels) & mask);
if (SDL_PIXELORDER(temp->format) == SDL_BITMAPORDER_4321)
SDL_SetSurfaceColorKey(temp, true, (*(Uint8 *)temp->pixels) & mask);
else
SDL_SetSurfaceColorKey(temp, SDL_TRUE, ((*(Uint8 *)temp->pixels) >> (8 - bpp)) & mask);
SDL_SetSurfaceColorKey(temp, true, ((*(Uint8 *)temp->pixels) >> (8 - bpp)) & mask);
} else {
switch (temp->format->bits_per_pixel) {
switch (SDL_BITSPERPIXEL(temp->format)) {
case 15:
SDL_SetSurfaceColorKey(temp, SDL_TRUE,
SDL_SetSurfaceColorKey(temp, true,
(*(Uint16 *)temp->pixels) & 0x00007FFF);
break;
case 16:
SDL_SetSurfaceColorKey(temp, SDL_TRUE, *(Uint16 *)temp->pixels);
SDL_SetSurfaceColorKey(temp, true, *(Uint16 *)temp->pixels);
break;
case 24:
SDL_SetSurfaceColorKey(temp, SDL_TRUE,
SDL_SetSurfaceColorKey(temp, true,
(*(Uint32 *)temp->pixels) & 0x00FFFFFF);
break;
case 32:
SDL_SetSurfaceColorKey(temp, SDL_TRUE, *(Uint32 *)temp->pixels);
SDL_SetSurfaceColorKey(temp, true, *(Uint32 *)temp->pixels);
break;
}
}