From 31a17cd3c61d67862a5d55068a86984f33c2c0b4 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 4 Aug 2022 21:35:31 +1000
Subject: [PATCH] FrontendCommon: Remove SDLInitializer

Not needed anymore.
---
 src/frontend-common/CMakeLists.txt            |  2 --
 src/frontend-common/frontend-common.vcxproj   |  6 ------
 .../frontend-common.vcxproj.filters           |  2 --
 src/frontend-common/sdl_initializer.cpp       | 21 -------------------
 src/frontend-common/sdl_initializer.h         |  5 -----
 5 files changed, 36 deletions(-)
 delete mode 100644 src/frontend-common/sdl_initializer.cpp
 delete mode 100644 src/frontend-common/sdl_initializer.h

diff --git a/src/frontend-common/CMakeLists.txt b/src/frontend-common/CMakeLists.txt
index ed5f12923..9a090e70f 100644
--- a/src/frontend-common/CMakeLists.txt
+++ b/src/frontend-common/CMakeLists.txt
@@ -90,8 +90,6 @@ if(SDL2_FOUND)
   target_sources(frontend-common PRIVATE 
     sdl_input_source.cpp
     sdl_input_source.h
-    sdl_initializer.cpp
-    sdl_initializer.h
   )
   target_compile_definitions(frontend-common PUBLIC "WITH_SDL2=1")
   target_include_directories(frontend-common PRIVATE ${SDL2_INCLUDE_DIRS})
diff --git a/src/frontend-common/frontend-common.vcxproj b/src/frontend-common/frontend-common.vcxproj
index 92819c77a..4e34c63fb 100644
--- a/src/frontend-common/frontend-common.vcxproj
+++ b/src/frontend-common/frontend-common.vcxproj
@@ -34,9 +34,6 @@
     <ClCompile Include="postprocessing_chain.cpp" />
     <ClCompile Include="postprocessing_shader.cpp" />
     <ClCompile Include="postprocessing_shadergen.cpp" />
-    <ClCompile Include="sdl_initializer.cpp">
-      <ExcludedFromBuild Condition="'$(BuildingForUWP)'=='true'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="sdl_input_source.cpp" />
     <ClCompile Include="vulkan_host_display.cpp">
       <ExcludedFromBuild Condition="'$(Platform)'=='ARM64' Or '$(BuildingForUWP)'=='true'">true</ExcludedFromBuild>
@@ -77,9 +74,6 @@
     <ClInclude Include="postprocessing_chain.h" />
     <ClInclude Include="postprocessing_shader.h" />
     <ClInclude Include="postprocessing_shadergen.h" />
-    <ClInclude Include="sdl_initializer.h">
-      <ExcludedFromBuild Condition="'$(BuildingForUWP)'=='true'">true</ExcludedFromBuild>
-    </ClInclude>
     <ClInclude Include="sdl_input_source.h" />
     <ClInclude Include="vulkan_host_display.h">
       <ExcludedFromBuild Condition="'$(Platform)'=='ARM64' Or '$(BuildingForUWP)'=='true'">true</ExcludedFromBuild>
diff --git a/src/frontend-common/frontend-common.vcxproj.filters b/src/frontend-common/frontend-common.vcxproj.filters
index 8b47d2e3e..b7d37a9ff 100644
--- a/src/frontend-common/frontend-common.vcxproj.filters
+++ b/src/frontend-common/frontend-common.vcxproj.filters
@@ -2,7 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="icon.cpp" />
-    <ClCompile Include="sdl_initializer.cpp" />
     <ClCompile Include="common_host.cpp" />
     <ClCompile Include="vulkan_host_display.cpp" />
     <ClCompile Include="d3d11_host_display.cpp" />
@@ -34,7 +33,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="icon.h" />
-    <ClInclude Include="sdl_initializer.h" />
     <ClInclude Include="common_host.h" />
     <ClInclude Include="vulkan_host_display.h" />
     <ClInclude Include="d3d11_host_display.h" />
diff --git a/src/frontend-common/sdl_initializer.cpp b/src/frontend-common/sdl_initializer.cpp
deleted file mode 100644
index e69e6b204..000000000
--- a/src/frontend-common/sdl_initializer.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "sdl_initializer.h"
-#include "common/assert.h"
-#include <SDL.h>
-
-namespace FrontendCommon {
-static bool s_sdl_initialized = false;
-
-void EnsureSDLInitialized()
-{
-  if (s_sdl_initialized)
-    return;
-
-  if (SDL_Init(0) < 0)
-  {
-    Panic("SDL_Init(0) failed");
-    return;
-  }
-
-  s_sdl_initialized = true;
-}
-} // namespace FrontendCommon
diff --git a/src/frontend-common/sdl_initializer.h b/src/frontend-common/sdl_initializer.h
deleted file mode 100644
index 22af3c439..000000000
--- a/src/frontend-common/sdl_initializer.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-namespace FrontendCommon {
-void EnsureSDLInitialized();
-}
\ No newline at end of file