Merge pull request #1230 from tsoding/optimization

[nothing.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index f000122a9052e6e46223312c4df8a6de8a7718fc..e4e851e69e3ac72dab600ffd2a47716d20c218fa 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -44,7 +44,6 @@ void recalculate_display_scale(SDL_Window* win, SDL_Renderer* rend)
     SDL_GetRendererOutputSize(rend, &w1, NULL);
 
     current_display_scale = (float) w1 / (float) w0;
-    log_info("Current display scale: %.1f\n", current_display_scale);
 }
 
 static
@@ -84,7 +83,7 @@ int main(int argc, char *argv[])
 
     Lt *lt = create_lt();
 
-    int fps = 30;
+    int fps = 60;
 
     for (int i = 1; i < argc;) {
         if (strcmp(argv[i], "--fps") == 0) {
@@ -107,7 +106,7 @@ int main(int argc, char *argv[])
         }
     }
 
-    if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
+    if (SDL_Init(SDL_INIT_EVERYTHING & ~SDL_INIT_HAPTIC) < 0) {
         log_fail("Could not initialize SDL: %s\n", SDL_GetError());
         RETURN_LT(lt, -1);
     }
@@ -133,12 +132,17 @@ int main(int argc, char *argv[])
 
     SDL_Renderer *const renderer = PUSH_LT(
         lt,
-        SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC),
+        SDL_CreateRenderer(window, -1, RENDERER_CONFIG),
         SDL_DestroyRenderer);
     if (renderer == NULL) {
         log_fail("Could not create SDL renderer: %s\n", SDL_GetError());
         RETURN_LT(lt, -1);
     }
+
+    SDL_RendererInfo info;
+    SDL_GetRendererInfo(renderer, &info);
+    log_info("Using SDL Renderer: %s\n", info.name);
+
     if (SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_BLEND) < 0) {
         log_fail("Could not set up blending mode for the renderer: %s\n", SDL_GetError());
         RETURN_LT(lt, -1);
@@ -234,7 +238,7 @@ int main(int argc, char *argv[])
         }
 
         const int64_t end_frame_time = (int64_t) SDL_GetTicks();
-        SDL_Delay((unsigned int) max_int64(10, delta_time - (end_frame_time - begin_frame_time)));
+        SDL_Delay((unsigned int) MAX(int64_t, 10, delta_time - (end_frame_time - begin_frame_time)));
     }
 
     RETURN_LT(lt, 0);