Tha_14/tomato-testing
1
0
Fork 0
forked from Green-Sky/tomato
Code Pull Requests Actions Packages Releases Activity

more sdl upgrade changes

Browse Source
This commit is contained in:
Green Sky 2024-10-05 15:44:29 +02:00
parent abd95b949f
commit 9402ff666f
No known key found for this signature in database
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
external/sdl/CMakeLists.txt vendored
View File

@ -24,6 +24,7 @@ if (NOT TARGET SDL3::SDL3)
#GIT_TAG 67b973b5fad633b3be76d4daf4fd9fece292c25f # tip 29-07-2024 #GIT_TAG 67b973b5fad633b3be76d4daf4fd9fece292c25f # tip 29-07-2024
#GIT_TAG 6e885d96193a4b0096fe7fed6d4e6c3e5f247283 # tip 09-09-2024 #GIT_TAG 6e885d96193a4b0096fe7fed6d4e6c3e5f247283 # tip 09-09-2024
#GIT_TAG 9dd8859240703d886941733ad32c1dc6f50d64f0 # tip 19-09-2024 #GIT_TAG 9dd8859240703d886941733ad32c1dc6f50d64f0 # tip 19-09-2024
#GIT_TAG afdf325fb4090e93a124519d1a3bc1fbe0ba9025 # bad
GIT_TAG e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e # tip 05-10-2024 (3.1.3) GIT_TAG e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e # tip 05-10-2024 (3.1.3)
FIND_PACKAGE_ARGS # for the future FIND_PACKAGE_ARGS # for the future

16
flake.lock
View File

@ -63,34 +63,34 @@
"sdl3": { "sdl3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726672741, "lastModified": 1728073678,
"narHash": "sha256-+L1khIk2nHI7V8o/RVk2MEHv+baoQvISNHNclOWPxQM=", "narHash": "sha256-S7yRcLHMPgq6+gec8l+ESxp2dJ+6Po/UNsBUXptQzMQ=",
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL", "repo": "SDL",
"rev": "9dd8859240703d886941733ad32c1dc6f50d64f0", "rev": "e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL", "repo": "SDL",
"rev": "9dd8859240703d886941733ad32c1dc6f50d64f0", "rev": "e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e",
"type": "github" "type": "github"
} }
}, },
"sdl3_image": { "sdl3_image": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1726603202, "lastModified": 1727262062,
"narHash": "sha256-jLKf3xSqjIL7L6iarQAiwcrmIQlM4R1zC2gXGXcdwPA=", "narHash": "sha256-o2NV02FeKSaQO3CBKYlqsu3HImziYCtWfum8G/pkX5o=",
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL_image", "repo": "SDL_image",
"rev": "b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc", "rev": "6f4584340b9b78542d11bf0232a1a0862de1f0a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "libsdl-org", "owner": "libsdl-org",
"repo": "SDL_image", "repo": "SDL_image",
"rev": "b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc", "rev": "6f4584340b9b78542d11bf0232a1a0862de1f0a9",
"type": "github" "type": "github"
} }
}, },

4
flake.nix
View File

@ -11,11 +11,11 @@
flake = false; flake = false;
}; };
sdl3 = { sdl3 = {
url = "github:libsdl-org/SDL/9dd8859240703d886941733ad32c1dc6f50d64f0"; # keep in sync this cmake url = "github:libsdl-org/SDL/e292d1f5ace469f718d7b6b4dec8c28e37dcaa0e"; # keep in sync this cmake
flake = false; flake = false;
}; };
sdl3_image = { sdl3_image = {
url = "github:libsdl-org/SDL_image/b56e6c4d1a1c03b3904a8ad21f1fa73c651ffbfc"; url = "github:libsdl-org/SDL_image/6f4584340b9b78542d11bf0232a1a0862de1f0a9";
flake = false; flake = false;
}; };
}; };

4
src/image_loader_sdl_bmp.cpp
View File

@ -10,7 +10,7 @@ ImageLoaderSDLBMP::ImageInfo ImageLoaderSDLBMP::loadInfoFromMemory(const uint8_t
auto* ios = SDL_IOFromConstMem(data, data_size); auto* ios = SDL_IOFromConstMem(data, data_size);
SDL_Surface* surf = SDL_LoadBMP_IO(ios, SDL_TRUE); SDL_Surface* surf = SDL_LoadBMP_IO(ios, true);
if (surf == nullptr) { if (surf == nullptr) {
return res; return res;
} }
@ -31,7 +31,7 @@ ImageLoaderSDLBMP::ImageResult ImageLoaderSDLBMP::loadFromMemoryRGBA(const uint8
auto* ios = SDL_IOFromConstMem(data, data_size); auto* ios = SDL_IOFromConstMem(data, data_size);
SDL_Surface* surf = SDL_LoadBMP_IO(ios, SDL_TRUE); SDL_Surface* surf = SDL_LoadBMP_IO(ios, true);
if (surf == nullptr) { if (surf == nullptr) {
return {}; return {};
} }

4
src/image_loader_sdl_image.cpp
View File

@ -58,7 +58,7 @@ ImageLoaderSDLImage::ImageInfo ImageLoaderSDLImage::loadInfoFromMemory(const uin
return res; return res;
} }
SDL_Surface* surf = IMG_Load_IO(ios, SDL_TRUE); SDL_Surface* surf = IMG_Load_IO(ios, true);
if (surf == nullptr) { if (surf == nullptr) {
return res; return res;
} }
@ -83,7 +83,7 @@ ImageLoaderSDLImage::ImageResult ImageLoaderSDLImage::loadFromMemoryRGBA(const u
return res; return res;
} }
IMG_Animation* anim = IMG_LoadAnimation_IO(ios, SDL_TRUE); IMG_Animation* anim = IMG_LoadAnimation_IO(ios, true);
if (anim == nullptr) { if (anim == nullptr) {
return res; return res;
} }

2
src/sdl_clipboard_utils.cpp
View File

@ -9,7 +9,7 @@
static const char* clipboardHas(const std::vector<std::string_view>& filter_mime_types) { static const char* clipboardHas(const std::vector<std::string_view>& filter_mime_types) {
for (const auto& mime_type : filter_mime_types) { for (const auto& mime_type : filter_mime_types) {
// ASSERTS that stringview is null terminated // ASSERTS that stringview is null terminated
if (SDL_HasClipboardData(mime_type.data()) == SDL_TRUE) { if (SDL_HasClipboardData(mime_type.data())) {
return mime_type.data(); return mime_type.data();
} }
} }