From 51a586d11abba26cba611b57d5261b6111062cd4 Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sat, 10 Mar 2018 14:52:48 +1000
Subject: [PATCH] GLUtil: Encapsulate functions in a namespace

---
 Source/Core/Common/GL/GLUtil.cpp                   |  5 ++++-
 Source/Core/Common/GL/GLUtil.h                     | 12 ++++--------
 Source/Core/VideoBackends/OGL/main.cpp             |  2 +-
 Source/Core/VideoBackends/Software/SWOGLWindow.cpp |  4 ++--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Common/GL/GLUtil.cpp b/Source/Core/Common/GL/GLUtil.cpp
index b9f35110ee..0cbe77a1ba 100644
--- a/Source/Core/Common/GL/GLUtil.cpp
+++ b/Source/Core/Common/GL/GLUtil.cpp
@@ -11,12 +11,14 @@
 
 std::unique_ptr<cInterfaceBase> GLInterface;
 
+namespace GLUtil
+{
 void InitInterface()
 {
   GLInterface = HostGL_CreateGLInterface();
 }
 
-GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string& fragmentShader)
+GLuint CompileProgram(const std::string& vertexShader, const std::string& fragmentShader)
 {
   // generate objects
   GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
@@ -100,3 +102,4 @@ GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string&
 
   return programID;
 }
+}
diff --git a/Source/Core/Common/GL/GLUtil.h b/Source/Core/Common/GL/GLUtil.h
index 02f4f18d8a..f7030f8a7a 100644
--- a/Source/Core/Common/GL/GLUtil.h
+++ b/Source/Core/Common/GL/GLUtil.h
@@ -8,12 +8,8 @@
 
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
-#ifndef _WIN32
-
-#include <sys/types.h>
-
-#endif
+namespace GLUtil
+{
 void InitInterface();
-
-// Helpers
-GLuint OpenGL_CompileProgram(const std::string& vertexShader, const std::string& fragmentShader);
+GLuint CompileProgram(const std::string& vertexShader, const std::string& fragmentShader);
+}
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index 99952d1d9f..95dfeb23e7 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -160,7 +160,7 @@ bool VideoBackend::Initialize(void* window_handle)
   InitBackendInfo();
   InitializeShared();
 
-  InitInterface();
+  GLUtil::InitInterface();
   GLInterface->SetMode(GLInterfaceMode::MODE_DETECT);
   if (!GLInterface->Create(window_handle, g_ActiveConfig.stereo_mode == StereoMode::QuadBuffer))
     return false;
diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
index 8027d3fb68..695f58cc1d 100644
--- a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
+++ b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
@@ -15,7 +15,7 @@ std::unique_ptr<SWOGLWindow> SWOGLWindow::s_instance;
 
 void SWOGLWindow::Init(void* window_handle)
 {
-  InitInterface();
+  GLUtil::InitInterface();
   GLInterface->SetMode(GLInterfaceMode::MODE_DETECT);
   if (!GLInterface->Create(window_handle))
   {
@@ -71,7 +71,7 @@ void SWOGLWindow::Prepare()
                            "#version 300 es\n"
                            "precision highp float;\n";
 
-  m_image_program = OpenGL_CompileProgram(header + vertex_shader, header + frag_shader);
+  m_image_program = GLUtil::CompileProgram(header + vertex_shader, header + frag_shader);
 
   glUseProgram(m_image_program);