vdisp/gl: run glfwInit after init hints set

+ no longer store the init hints in the dictionary but set them directly
+ call the glewInit in help - this allow the output to be aligned with
selected platform, eg. `-d gl:platform=X11:fullhelp` lists X11 oonitors

Note that on wrong cmdline opt. glfwTerminate is called without prior
glfwInit in _dene but it doesn't seem to be causing problems so far.

Author: MartinPulec

src/video_display/gl.cpp

@@ -473,7 +473,6 @@ struct state_gl {
         int pos_y = INT_MIN;
 
         enum modeset_t { MODESET = -2, MODESET_SIZE_ONLY = GLFW_DONT_CARE, NOMODESET = 0 } modeset = NOMODESET; ///< positive vals force framerate
-        struct dictionary *init_hints;
         struct dictionary *window_hints;
         int use_pbo = -1;
         int req_monitor_idx = -1;
@@ -646,15 +645,20 @@ static void gl_show_help(bool full) {
                              keybindings[i].description);
         }
 
-        gl_print_monitors(full);
-        if (full) {
-                gl_print_platforms();
-        }
-        GLFWwindow *window = glfwCreateWindow(32, 32, DEFAULT_WIN_NAME, nullptr, nullptr);
-        if (window != nullptr) {
-                glfwMakeContextCurrent(window);
-                check_display_gl_version(true);
-                glfwDestroyWindow(window);
+        if (glfwInit() != GLFW_FALSE) {
+                gl_print_monitors(full);
+                if (full) {
+                        gl_print_platforms();
+                }
+                GLFWwindow *window = glfwCreateWindow(32, 32, DEFAULT_WIN_NAME,
+                                                      nullptr, nullptr);
+                if (window != nullptr) {
+                        glfwMakeContextCurrent(window);
+                        check_display_gl_version(true);
+                        glfwDestroyWindow(window);
+                }
+        } else {
+                MSG(ERROR, "Cannot initialize GLFW!\n");
         }
 
         col() << "Compiled " << SBOLD("features: ") << "SPOUT - "
@@ -731,7 +735,7 @@ get_hint_from_string(const char *string)
 
 /// @param window_hints true for window hints, otherwise init hints
 static void
-parse_hints(struct state_gl *s, bool window_hints, char *hints)
+set_hints(struct state_gl *s, bool window_hints, char *hints)
 {
         char *tok      = nullptr;
         char *save_ptr = nullptr;
@@ -745,29 +749,36 @@ parse_hints(struct state_gl *s, bool window_hints, char *hints)
                 const char *key_s = tok;
                 const char *val_s = strchr(tok, '=') + 1;
                 *strchr(tok, '=') = '\0';
-                dictionary_insert(window_hints ? s->window_hints
-                                               : s->init_hints,
-                                  key_s, val_s);
+                if (window_hints) {
+                        dictionary_insert(s->window_hints, key_s, val_s);
+                } else {
+#if GLFW_VERSION_MAJOR < 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR < 3)
+                        MSG(WARNING,
+                            "GLFW version < 3.3 doesn't support init hints. "
+                            "Ignoring them.\n");
+#else
+
+                        glfwInitHint(get_hint_from_string(key_s),
+                                     get_hint_from_string(val_s));
+#endif
+                }
         }
 }
 
 static bool
-set_platform(struct state_gl *s, const char *platform)
+set_platform(const char *platform)
 {
 #ifdef GLFW_PLATFORM
         for (unsigned i = 0; i < ARR_COUNT(platform_map); ++i) {
                 if (strcasecmp(platform_map[i].name, platform) == 0) {
-                        char platform[32];
-                        snprintf_ch(platform, "%d", platform_map[i].platform_id);
-                        dictionary_insert(s->init_hints,
-                                          TOSTRING(GLFW_PLATFORM), platform);
+                        glfwInitHint(GLFW_PLATFORM, platform_map[i].platform_id);
                         return true;
                 }
         }
         MSG(ERROR, "Unknown platform: %s\n", platform);
         return false;
 #else
-        (void) s, (void)  platform;
+        (void) platform;
         MSG(ERROR, "platforms unsupported (old GLFW)\n");
         return false;
 #endif
@@ -879,11 +890,11 @@ display_gl_parse_fmt(struct state_gl *s, char *ptr)
                 } else if (strcmp(tok, "noresizable") == 0) {
                         s->noresizable = true;
                 } else if (strstr(tok, "window_hint=") == tok) {
-                        parse_hints(s, true, strchr(tok, '=') + 1);
+                        set_hints(s, true, strchr(tok, '=') + 1);
                 } else if (strstr(tok, "init_hint=") == tok) {
-                        parse_hints(s, false, strchr(tok, '=') + 1);
+                        set_hints(s, false, strchr(tok, '=') + 1);
                 } else if (IS_KEY_PREFIX(tok, "platform")) {
-                        ret = ret && set_platform(s, strchr(tok, '=') + 1);
+                        ret = ret && set_platform(strchr(tok, '=') + 1);
                 } else if (strcmp(tok, "list_hints") == 0) {
                         list_hints();
                         return false;
@@ -901,16 +912,11 @@ static void * display_gl_init(struct module *parent, const char *fmt, unsigned i
         UNUSED(flags);
 
         glfwSetErrorCallback(glfw_print_error);
-        if (glfwInit() != GLFW_TRUE) {
-                MSG(ERROR, "Cannot initialize GLFW!\n");
-                return nullptr;
-        }
 
         auto *s = new state_gl();
         module_init_default(&s->mod);
         s->mod.cls = MODULE_CLASS_DATA;
         module_register(&s->mod, parent);
-        s->init_hints = dictionary_init();
         s->window_hints = dictionary_init();
         dictionary_insert(s->window_hints, TOSTRING(GLFW_AUTO_ICONIFY),
                           TOSTRING(GLFW_FALSE));
@@ -930,6 +936,12 @@ static void * display_gl_init(struct module *parent, const char *fmt, unsigned i
                 }
         }
 
+        if (glfwInit() != GLFW_TRUE) {
+                MSG(ERROR, "Cannot initialize GLFW!\n");
+                display_gl_done(s);
+                return nullptr;
+        }
+
         s->use_pbo = s->use_pbo == -1 ? !check_rpi_pbo_quirks() : s->use_pbo; // don't use PBO for Raspberry Pi (better performance)
 
         log_msg(LOG_LEVEL_INFO,"GL setup: fullscreen: %s, deinterlace: %s\n",
@@ -947,18 +959,6 @@ static void * display_gl_init(struct module *parent, const char *fmt, unsigned i
                                         keybindings[i].description);
         }
 
-#if GLFW_VERSION_MAJOR < 3 || (GLFW_VERSION_MAJOR == 3 && GLFW_VERSION_MINOR < 3)
-        if (dictionary_first(s->init_hints, nullptr) != nullptr) {
-                MSG(WARNING, "GLFW version < 3.3 doesn't support init hints. "
-                             "Ignoring them.\n");
-        }
-#else
-        DICTIONARY_ITERATE(s->init_hints, key_s, val_s) {
-                glfwInitHint(get_hint_from_string(key_s),
-                             get_hint_from_string(val_s));
-        }
-#endif
-
         if (!display_gl_init_opengl(s)) {
                 display_gl_done(s);
                 return nullptr;
@@ -2212,7 +2212,6 @@ static void display_gl_done(void *state)
 
         vf_free(s->current_frame);
         free(s->scratchpad);
-        dictionary_destroy(s->init_hints);
         dictionary_destroy(s->window_hints);
 
         glfwTerminate();