Merge commit '3a7f96fd99528968c39b5be81db067ca018d432b' into dev

This commit is contained in:
SimoneN64
2024-09-18 20:42:08 +02:00
641 changed files with 31269 additions and 30646 deletions

View File

@@ -31,7 +31,7 @@ typedef struct GL_Context
static SDLTest_CommonState *state;
static SDL_GLContext context;
static GL_Context ctx;
static SDL_bool suspend_when_occluded;
static bool suspend_when_occluded;
static int LoadContext(GL_Context *data)
{
@@ -231,9 +231,6 @@ int main(int argc, char *argv[])
return 1;
}
/* Enable standard application logging */
SDL_SetLogPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
for (i = 1; i < argc;) {
int consumed;
@@ -246,7 +243,7 @@ int main(int argc, char *argv[])
accel = SDL_atoi(argv[i + 1]);
consumed = 2;
} else if(SDL_strcasecmp(argv[i], "--suspend-when-occluded") == 0) {
suspend_when_occluded = SDL_TRUE;
suspend_when_occluded = true;
consumed = 1;
} else {
consumed = -1;
@@ -374,7 +371,7 @@ int main(int argc, char *argv[])
then = SDL_GetTicks();
done = 0;
while (!done) {
SDL_bool update_swap_interval = SDL_FALSE;
bool update_swap_interval = false;
int active_windows = 0;
/* Check for events */
@@ -384,10 +381,10 @@ int main(int argc, char *argv[])
if (event.type == SDL_EVENT_KEY_DOWN) {
if (event.key.key == SDLK_O) {
swap_interval--;
update_swap_interval = SDL_TRUE;
update_swap_interval = true;
} else if (event.key.key == SDLK_P) {
swap_interval++;
update_swap_interval = SDL_TRUE;
update_swap_interval = true;
}
}
}