From 5aa26e7eee259d30787dc513e25a3d3f5692cc0a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 10 Jun 2020 23:40:29 +0200
Subject: [PATCH] Optimize check_menu_driver_compatibility

---
 configuration.c | 26 ++++++++++++++++++--------
 retroarch.c     |  1 -
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/configuration.c b/configuration.c
index 3f2b1488f0..91f4b33a1a 100644
--- a/configuration.c
+++ b/configuration.c
@@ -2510,20 +2510,30 @@ static bool check_menu_driver_compatibility(settings_t *settings)
       return true;
 
    /* TODO/FIXME - maintenance hazard */
-   if (string_is_equal(video_driver, "d3d9")   ||
-         string_is_equal(video_driver, "d3d10")  ||
-         string_is_equal(video_driver, "d3d11")  ||
-         string_is_equal(video_driver, "d3d12")  ||
+   if (string_starts_with(video_driver, "d3d"))
+      if (
+            string_is_equal(video_driver, "d3d9")   ||
+            string_is_equal(video_driver, "d3d10")  ||
+            string_is_equal(video_driver, "d3d11")  ||
+            string_is_equal(video_driver, "d3d12")
+         )
+      return true;
+   if (string_starts_with(video_driver, "gl"))
+      if (
+            string_is_equal(video_driver, "gl")     ||
+            string_is_equal(video_driver, "gl1")    ||
+            string_is_equal(video_driver, "glcore")
+         )
+         return true;
+   if (
          string_is_equal(video_driver, "caca")   ||
          string_is_equal(video_driver, "gdi")    ||
-         string_is_equal(video_driver, "gl")     ||
-         string_is_equal(video_driver, "gl1")    ||
          string_is_equal(video_driver, "gx2")    ||
          string_is_equal(video_driver, "vulkan") ||
-         string_is_equal(video_driver, "glcore") ||
          string_is_equal(video_driver, "metal")  ||
          string_is_equal(video_driver, "ctr")    ||
-         string_is_equal(video_driver, "vita2d"))
+         string_is_equal(video_driver, "vita2d")
+      )
       return true;
 
    return false;
diff --git a/retroarch.c b/retroarch.c
index 6d276d2849..cb4381f37a 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2197,7 +2197,6 @@ struct rarch_state
    struct rarch_dir_list dir_shader_list;
 
 #ifdef HAVE_MENU
-   /* Since these are static/global, they are initialised to zero */
    menu_input_pointer_hw_state_t menu_input_pointer_hw_state;
    menu_input_t menu_input_state;
 #endif