From 01cdcc83a3a6d65eeb435d549761fc63e68f2b32 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 26 Dec 2012 13:15:19 -0600
Subject: [PATCH] Merge Fail: Make sure we are using the interface file to get
 backbuffer dimensions. GL helper function was duplicated.

---
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp | 63 -------------------
 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h   |  3 -
 .../Plugin_VideoSoftware/Src/SWRenderer.cpp   |  4 +-
 3 files changed, 2 insertions(+), 68 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
index a5c76bdd6a..29a1b6a662 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
@@ -127,69 +127,6 @@ GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentSha
 	return programID;
 }
 
-GLuint OpenGL_CompileProgram ( const char* vertexShader, const char* fragmentShader )
-{
-	// generate objects
-	GLuint vertexShaderID = glCreateShader(GL_VERTEX_SHADER);
-	GLuint fragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
-	GLuint programID = glCreateProgram();
-	GLint Result = GL_FALSE;
-	char stringBuffer[1024];
-	GLsizei stringBufferUsage = 0;
-	
-	// compile vertex shader
-	glShaderSource(vertexShaderID, 1, &vertexShader, NULL);
-	glCompileShader(vertexShaderID);
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
-	glGetShaderiv(vertexShaderID, GL_COMPILE_STATUS, &Result);
-	glGetShaderInfoLog(vertexShaderID, 1024, &stringBufferUsage, stringBuffer);
-	if(Result && stringBufferUsage) {
-		ERROR_LOG(VIDEO, "GLSL vertex shader warnings:\n%s%s", stringBuffer, vertexShader);
-	} else if(!Result) {
-		ERROR_LOG(VIDEO, "GLSL vertex shader error:\n%s%s", stringBuffer, vertexShader);
-	} else {
-		DEBUG_LOG(VIDEO, "GLSL vertex shader compiled:\n%s", vertexShader);
-	}
-	bool shader_errors = !Result;
-#endif
-	
-	// compile fragment shader
-	glShaderSource(fragmentShaderID, 1, &fragmentShader, NULL);
-	glCompileShader(fragmentShaderID);
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
-	glGetShaderiv(fragmentShaderID, GL_COMPILE_STATUS, &Result);
-	glGetShaderInfoLog(fragmentShaderID, 1024, &stringBufferUsage, stringBuffer);
-	if(Result && stringBufferUsage) {
-		ERROR_LOG(VIDEO, "GLSL fragment shader warnings:\n%s%s", stringBuffer, fragmentShader);
-	} else if(!Result) {
-		ERROR_LOG(VIDEO, "GLSL fragment shader error:\n%s%s", stringBuffer, fragmentShader);
-	} else {
-		DEBUG_LOG(VIDEO, "GLSL fragment shader compiled:\n%s", fragmentShader);
-	}
-	shader_errors |= !Result;
-#endif
-	
-	// link them
-	glAttachShader(programID, vertexShaderID);
-	glAttachShader(programID, fragmentShaderID);
-	glLinkProgram(programID);
-#if defined(_DEBUG) || defined(DEBUGFAST) || defined(DEBUG_GLSL)
-	glGetProgramiv(programID, GL_LINK_STATUS, &Result);
-	glGetProgramInfoLog(programID, 1024, &stringBufferUsage, stringBuffer);
-	if(Result && stringBufferUsage) {
-		ERROR_LOG(VIDEO, "GLSL linker warnings:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
-	} else if(!Result && !shader_errors) {
-		ERROR_LOG(VIDEO, "GLSL linker error:\n%s%s%s", stringBuffer, vertexShader, fragmentShader);
-	}
-#endif
-	
-	// cleanup
-	glDeleteShader(vertexShaderID);
-	glDeleteShader(fragmentShaderID);
-	
-	return programID;
-}
-
 
 GLuint OpenGL_ReportGLError(const char *function, const char *file, int line)
 {
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
index 1d179fdefa..09d38bb731 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
@@ -52,9 +52,6 @@ void InitInterface();
 // Helpers
 GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
 
-// Helpers
-GLuint OpenGL_CompileProgram(const char *vertexShader, const char *fragmentShader);
-
 // Error reporting - use the convenient macros.
 void OpenGL_ReportARBProgramError();
 GLuint OpenGL_ReportGLError(const char *function, const char *file, int line);
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
index 32a6f98dd0..e148906692 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
@@ -94,8 +94,8 @@ void SWRenderer::Prepare()
 void SWRenderer::RenderText(const char* pstr, int left, int top, u32 color)
 {
 #ifndef USE_GLES
-	int nBackbufferWidth = (int)OpenGL_GetBackbufferWidth();
-	int nBackbufferHeight = (int)OpenGL_GetBackbufferHeight();
+	int nBackbufferWidth = (int)GLInterface->GetBackBufferWidth();
+	int nBackbufferHeight = (int)GLInterface->GetBackBufferHeight();
 	
 	s_pfont->printMultilineText(pstr,
 		left * 2.0f / (float)nBackbufferWidth - 1,