More cleanup in gl plugin

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2337 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 1 insertions, 72 deletions

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index befd36060e..4c39940ea3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -65,7 +65,6 @@ CGprofile g_cgfProf;
 RasterFont* s_pfont = NULL;
 
 static bool s_bFullscreen = false;
-static bool s_bOutputCgErrors = true;
 
 static int nZBufferRender = 0; // if > 0, then use zbuffer render, and count down.
 
@@ -776,7 +775,7 @@ Renderer::RenderMode Renderer::GetRenderMode()
     return s_RenderMode;
 }
 
-void Renderer::Swap(const TRectangle& rc)
+void Renderer::Swap()
 {
     OpenGL_Update(); // just updates the render window position and the backbuffer size
 
@@ -1011,76 +1010,6 @@ bool Renderer::SaveRenderTarget(const char* filename, int jpeg)
     return SaveTGA(filename, nBackbufferWidth, nBackbufferHeight, &data[0]);
 }
 
-void Renderer::SetCgErrorOutput(bool bOutput)
-{
-    s_bOutputCgErrors = bOutput;
-}
-
-void HandleGLError()
-{
-    const GLubyte* pstr = glGetString(GL_PROGRAM_ERROR_STRING_ARB);
-    if (pstr != NULL && pstr[0] != 0)
-	{
-        GLint loc = 0;
-        glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc);
-        ERROR_LOG("program error at %d: ", loc);
-        ERROR_LOG((char*)pstr);
-        ERROR_LOG("\n");
-    }
-
-    // check the error status of this framebuffer */
-    GLenum error = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-
-    // if error != GL_FRAMEBUFFER_COMPLETE_EXT, there's an error of some sort 
-    if (!error)
-		return;
-
-    switch(error)
-	{
-		case GL_FRAMEBUFFER_COMPLETE_EXT:
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT:
-			ERROR_LOG("Error! missing a required image/buffer attachment!\n");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT:
-			ERROR_LOG("Error! has no images/buffers attached!\n");
-			break;
-//      case GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT:
-//          ERROR_LOG("Error! has an image/buffer attached in multiple locations!\n");
-//           break;
-		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT:
-			ERROR_LOG("Error! has mismatched image/buffer dimensions!\n");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT:
-			ERROR_LOG("Error! colorbuffer attachments have different types!\n");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT:
-			ERROR_LOG("Error! trying to draw to non-attached color buffer!\n");
-			break;
-		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT:
-			ERROR_LOG("Error! trying to read from a non-attached color buffer!\n");
-			break;
-		case GL_FRAMEBUFFER_UNSUPPORTED_EXT:
-			ERROR_LOG("Error! format is not supported by current graphics card/driver!\n");
-			break;
-		default:
-			ERROR_LOG("*UNKNOWN ERROR* reported from glCheckFramebufferStatusEXT()!\n");
-			break;
-	}
-}
-
-void HandleCgError(CGcontext ctx, CGerror err, void* appdata)
-{
-    if (s_bOutputCgErrors)
-	{
-        ERROR_LOG("Cg error: %s\n", cgGetErrorString(err));
-        const char* listing = cgGetLastListing(g_cgcontext);
-        if (listing != NULL) {
-            ERROR_LOG("    last listing: %s\n", listing);
-        }
-    }
-}
-
 //////////////////////////////////////////////////////////////////////////////////////
 // Called from VertexShaderManager
 // ----------------------