From 955da3b57801b6ea14abdb6cbc7e530670b66ae7 Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sun, 21 Feb 2021 21:47:55 +0100
Subject: [PATCH] Remove screen static initializer

Most of the fields are initialized dynamically.
---
 app/src/screen.c |  8 +++++++-
 app/src/screen.h | 33 ---------------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/app/src/screen.c b/app/src/screen.c
index bcccdd32..362ba1a8 100644
--- a/app/src/screen.c
+++ b/app/src/screen.c
@@ -215,10 +215,14 @@ on_frame_skipped(struct video_buffer *vb, void *userdata) {
 void
 screen_init(struct screen *screen, struct video_buffer *vb,
             struct fps_counter *fps_counter) {
-    *screen = (struct screen) SCREEN_INITIALIZER;
     screen->vb = vb;
     screen->fps_counter = fps_counter;
 
+    screen->resize_pending = false;
+    screen->has_frame = false;
+    screen->fullscreen = false;
+    screen->maximized = false;
+
     static const struct video_buffer_callbacks cbs = {
         .on_frame_available = on_frame_available,
         .on_frame_skipped = on_frame_skipped,
@@ -311,6 +315,8 @@ screen_init_rendering(struct screen *screen, const char *window_title,
     const char *renderer_name = r ? NULL : renderer_info.name;
     LOGI("Renderer: %s", renderer_name ? renderer_name : "(unknown)");
 
+    screen->mipmaps = false;
+
     // starts with "opengl"
     bool use_opengl = renderer_name && !strncmp(renderer_name, "opengl", 6);
     if (use_opengl) {
diff --git a/app/src/screen.h b/app/src/screen.h
index 8941416e..da80fa2d 100644
--- a/app/src/screen.h
+++ b/app/src/screen.h
@@ -38,39 +38,6 @@ struct screen {
     bool mipmaps;
 };
 
-#define SCREEN_INITIALIZER { \
-    .vb = NULL, \
-    .fps_counter = NULL, \
-    .window = NULL, \
-    .renderer = NULL, \
-    .texture = NULL, \
-    .gl = {0}, \
-    .frame_size = { \
-        .width = 0, \
-        .height = 0, \
-    }, \
-    .content_size = { \
-        .width = 0, \
-        .height = 0, \
-    }, \
-    .resize_pending = false, \
-    .windowed_content_size = { \
-        .width = 0, \
-        .height = 0, \
-    }, \
-    .rotation = 0, \
-    .rect = { \
-        .x = 0, \
-        .y = 0, \
-        .w = 0, \
-        .h = 0, \
-    }, \
-    .has_frame = false, \
-    .fullscreen = false, \
-    .maximized = false, \
-    .mipmaps = false, \
-}
-
 // initialize default values
 void
 screen_init(struct screen *screen, struct video_buffer *vb,