summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends/OGL
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2014-07-08 14:29:26 +0200
committerdegasus <wickmarkus@web.de>2014-07-11 16:07:23 +0200
commit22e1aa5bb4a159d6d66a321f978917614aa36331 (patch)
tree5f1ec329704dd6120cfb5966dba76387ad1bbc2f /Source/Core/VideoBackends/OGL
parent3ff1c538ee20f59e513640865bab8fb430e70e84 (diff)
mark all local functions as static
Diffstat (limited to 'Source/Core/VideoBackends/OGL')
-rw-r--r--Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp10
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp2
-rw-r--r--Source/Core/VideoBackends/OGL/Render.cpp14
-rw-r--r--Source/Core/VideoBackends/OGL/main.cpp4
4 files changed, 15 insertions, 15 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
index d7ba6292c9..5a62de6e65 100644
--- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
@@ -1583,7 +1583,7 @@ namespace GLExtensions
bool InitFunctionPointers();
// Initializes the extension list the old way
- void InitExtensionList21()
+ static void InitExtensionList21()
{
const char* extensions = (const char*)glGetString(GL_EXTENSIONS);
std::string tmp(extensions);
@@ -1593,7 +1593,7 @@ namespace GLExtensions
m_extension_list[tmp] = true;
}
- void InitExtensionList()
+ static void InitExtensionList()
{
m_extension_list.clear();
if (_isES3)
@@ -1730,7 +1730,7 @@ namespace GLExtensions
for (GLint i = 0; i < NumExtension; ++i)
m_extension_list[std::string((const char*)glGetStringi(GL_EXTENSIONS, i))] = true;
}
- void InitVersion()
+ static void InitVersion()
{
GLint major, minor;
glGetIntegerv(GL_MAJOR_VERSION, &major);
@@ -1743,7 +1743,7 @@ namespace GLExtensions
_GLVersion = 330; // Get all the fun things
}
- void* GetFuncAddress(std::string name, void **func)
+ static void* GetFuncAddress(std::string name, void **func)
{
*func = GLInterface->GetFuncAddress(name);
if (*func == nullptr)
@@ -1792,7 +1792,7 @@ namespace GLExtensions
}
// Private initialization functions
- bool HasFeatures(const std::string& extensions)
+ static bool HasFeatures(const std::string& extensions)
{
bool result = true;
std::string tmp;
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index c4c8f7c888..cafa560485 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -39,7 +39,7 @@ UidChecker<VertexShaderUid,VertexShaderCode> ProgramShaderCache::vertex_uid_chec
static char s_glsl_header[1024] = "";
-std::string GetGLSLVersionString()
+static std::string GetGLSLVersionString()
{
GLSL_VERSION v = g_ogl_config.eSupportedGLSLVersion;
switch(v)
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/Render.cpp
index f2567c0c8b..5cdc8d031f 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/Render.cpp
@@ -112,7 +112,7 @@ static bool s_efbCacheValid[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT];
static bool s_efbCacheIsCleared = false;
static std::vector<u32> s_efbCache[2][EFB_CACHE_WIDTH * EFB_CACHE_HEIGHT]; // 2 for PEEK_Z and PEEK_COLOR
-int GetNumMSAASamples(int MSAAMode)
+static int GetNumMSAASamples(int MSAAMode)
{
int samples;
switch (MSAAMode)
@@ -145,7 +145,7 @@ int GetNumMSAASamples(int MSAAMode)
return g_ogl_config.max_samples;
}
-void ApplySSAASettings() {
+static void ApplySSAASettings() {
// GLES3 doesn't support SSAA
if (GLInterface->GetMode() == GLInterfaceMode::MODE_OPENGL)
{
@@ -163,7 +163,7 @@ void ApplySSAASettings() {
}
}
-void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, const void* userParam)
+static void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const char* message, const void* userParam)
{
const char *s_source;
const char *s_type;
@@ -198,16 +198,16 @@ void GLAPIENTRY ErrorCallback( GLenum source, GLenum type, GLuint id, GLenum sev
}
// Two small Fallbacks to avoid GL_ARB_ES2_compatibility
-void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth)
+static void GLAPIENTRY DepthRangef(GLfloat neardepth, GLfloat fardepth)
{
glDepthRange(neardepth, fardepth);
}
-void GLAPIENTRY ClearDepthf(GLfloat depthval)
+static void GLAPIENTRY ClearDepthf(GLfloat depthval)
{
glClearDepth(depthval);
}
-void InitDriverInfo()
+static void InitDriverInfo()
{
std::string svendor = std::string(g_ogl_config.gl_vendor);
std::string srenderer = std::string(g_ogl_config.gl_renderer);
@@ -1299,7 +1299,7 @@ void Renderer::SetBlendMode(bool forceUpdate)
s_blendMode = newval;
}
-void DumpFrame(const std::vector<u8>& data, int w, int h)
+static void DumpFrame(const std::vector<u8>& data, int w, int h)
{
#if defined(HAVE_LIBAV) || defined(_WIN32)
if (g_ActiveConfig.bDumpFrames && !data.empty())
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp
index c4db8d94e9..fb4079a9c8 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@@ -103,7 +103,7 @@ std::string VideoBackend::GetDisplayName() const
return "OpenGL";
}
-void GetShaders(std::vector<std::string> &shaders)
+static void GetShaders(std::vector<std::string> &shaders)
{
std::set<std::string> already_found;
@@ -138,7 +138,7 @@ void GetShaders(std::vector<std::string> &shaders)
std::sort(shaders.begin(), shaders.end());
}
-void InitBackendInfo()
+static void InitBackendInfo()
{
g_Config.backend_info.APIType = API_OPENGL;
g_Config.backend_info.bUseRGBATextures = true;