PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2024-12-12 20:18:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use al_store_state and al_restore_state when dealing with threads

Browse source 
This lets the active Allegro file interface to be used by the new thread.
This commit is contained in:
Sebastian Krzyszkowiak 2020-04-04 04:47:10 +02:00
parent 5f7c0ff18f
commit 2e15e4d8dc
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/internal.c
View file

@ -283,7 +283,7 @@ SYMBOL_INTERNAL void Console_Unload(struct Game* game) {
SYMBOL_INTERNAL void* GamestateLoadingThread(void* arg) { SYMBOL_INTERNAL void* GamestateLoadingThread(void* arg) {
struct GamestateLoadingThreadData* data = arg; struct GamestateLoadingThreadData* data = arg;
data->game->_priv.loading.in_progress = true; data->game->_priv.loading.in_progress = true;
al_set_new_bitmap_flags(data->bitmap_flags); al_restore_state(&data->state);
data->gamestate->data = data->gamestate->api->load(data->game, &GamestateProgress); data->gamestate->data = data->gamestate->api->load(data->game, &GamestateProgress);
if (data->game->_priv.loading.progress != data->gamestate->progress_count) { if (data->game->_priv.loading.progress != data->gamestate->progress_count) {
PrintConsole(data->game, "[%s] WARNING: Gamestate_ProgressCount does not match the number of progress invokations (%d)!", data->gamestate->name, data->game->_priv.loading.progress); PrintConsole(data->game, "[%s] WARNING: Gamestate_ProgressCount does not match the number of progress invokations (%d)!", data->gamestate->name, data->game->_priv.loading.progress);
@ -295,7 +295,8 @@ SYMBOL_INTERNAL void* GamestateLoadingThread(void* arg) {
} }
#endif #endif
} }
data->bitmap_flags = al_get_new_bitmap_flags(); al_store_state(&data->state, ALLEGRO_STATE_NEW_FILE_INTERFACE | ALLEGRO_STATE_NEW_BITMAP_PARAMETERS | ALLEGRO_STATE_BLENDER);
data->game->_priv.loading.in_progress = false; data->game->_priv.loading.in_progress = false;
return NULL; return NULL;
} }

2
src/internal.h
View file

@ -73,7 +73,7 @@ struct List {
struct GamestateLoadingThreadData { struct GamestateLoadingThreadData {
struct Game* game; struct Game* game;
struct Gamestate* gamestate; struct Gamestate* gamestate;
int bitmap_flags; ALLEGRO_STATE state;
}; };
struct ScreenshotThreadData { struct ScreenshotThreadData {

5
src/mainloop.c
View file

@ -349,7 +349,8 @@ static inline bool MainloopTick(struct Game* game) {
game->_priv.loading.current = tmp; game->_priv.loading.current = tmp;
game->_priv.current_gamestate = tmp; game->_priv.current_gamestate = tmp;
struct GamestateLoadingThreadData data = {.game = game, .gamestate = tmp, .bitmap_flags = al_get_new_bitmap_flags()}; struct GamestateLoadingThreadData data = {.game = game, .gamestate = tmp};
al_store_state(&data.state, ALLEGRO_STATE_NEW_FILE_INTERFACE | ALLEGRO_STATE_NEW_BITMAP_PARAMETERS | ALLEGRO_STATE_BLENDER);
game->_priv.loading.in_progress = true; game->_priv.loading.in_progress = true;
double time = al_get_time(); double time = al_get_time();
game->_priv.loading.time = time; game->_priv.loading.time = time;
@ -406,7 +407,7 @@ static inline bool MainloopTick(struct Game* game) {
#endif #endif
al_convert_memory_bitmaps(); al_convert_memory_bitmaps();
al_set_new_bitmap_flags(data.bitmap_flags); al_restore_state(&data.state);
ReloadShaders(game, false); ReloadShaders(game, false);