From d515b69d88b029f5c7e5fa07540eeda5c3854b93 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 9 Nov 2009 11:36:54 +0000
Subject: [PATCH] Added GL token mappings for standard GL errors numbers for
 when no GLU is available

---
 src/osg/State.cpp           | 81 ++++++++++++++++++++++++++++++-------
 src/osgUtil/RenderStage.cpp | 10 +----
 2 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index 51692b7e4..18d7ab812 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -1088,7 +1088,24 @@ bool State::checkGLErrors(const char* str) const
         if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '" << error<<"'";
         else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
 #else
-        osg::notify(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
+            switch(errorNo)
+            {
+                case(GL_INVALID_ENUM):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM";
+                    break;
+                case(GL_INVALID_VALUE):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE";
+                    break;
+                case(GL_INVALID_OPERATION):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION";
+                    break;
+                case(GL_OUT_OF_MEMORY):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY";
+                    break;
+                default:
+                    osg::notify(WARN)<<"Warning: detected OpenGL error number 0x" << std::hex << errorNo << std::dec;
+                    break;
+            }
 #endif
         if (str) osg::notify(WARN)<<" at "<<str<< std::endl;
         else     osg::notify(WARN)<<" in osg::State."<< std::endl;
@@ -1103,13 +1120,30 @@ bool State::checkGLErrors(StateAttribute::GLMode mode) const
     GLenum errorNo = glGetError();
     if (errorNo!=GL_NO_ERROR)
     {
-#ifdef OSG_GLU_AVAILABLE
-        const char* error = (char*)gluErrorString(errorNo);
-        if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
-        else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
-#else
-        osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
-#endif
+        #ifdef OSG_GLU_AVAILABLE
+            const char* error = (char*)gluErrorString(errorNo);
+            if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+            else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+        #else
+            switch(errorNo)
+            {
+                case(GL_INVALID_ENUM):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+                    break;
+                case(GL_INVALID_VALUE):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+                    break;
+                case(GL_INVALID_OPERATION):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+                    break;
+                case(GL_OUT_OF_MEMORY):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+                    break;
+                default:
+                    osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying GLMode 0x"<<hex<<mode<<dec<< std::endl;
+                    break;
+            }
+        #endif
         return true;
     }
     return false;
@@ -1120,13 +1154,30 @@ bool State::checkGLErrors(const StateAttribute* attribute) const
     GLenum errorNo = glGetError();
     if (errorNo!=GL_NO_ERROR)
     {
-#ifdef OSG_GLU_AVAILABLE
-        const char* error = (char*)gluErrorString(errorNo);
-        if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying attribute "<<attribute->className()<<" "<<attribute<< std::endl;
-        else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
-#else
-        osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
-#endif
+        #ifdef OSG_GLU_AVAILABLE
+            const char* error = (char*)gluErrorString(errorNo);
+            if (error) osg::notify(WARN)<<"Warning: detected OpenGL error '"<< error <<"' after applying attribute "<<attribute->className()<<" "<<attribute<< std::endl;
+            else       osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+        #else
+            switch(errorNo)
+            {
+                case(GL_INVALID_ENUM):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_ENUM after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+                    break;
+                case(GL_INVALID_VALUE):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_VALUE after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+                    break;
+                case(GL_INVALID_OPERATION):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_INVALID_OPERATION after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+                    break;
+                case(GL_OUT_OF_MEMORY):
+                    osg::notify(WARN)<<"Warning: detected OpenGL error GL_OUT_OF_MEMORY after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+                    break;
+                default:
+                    osg::notify(WARN)<<"Warning: detected OpenGL error number 0x"<< std::hex << errorNo <<" after applying attribute "<<attribute->className()<<" "<<attribute<< std::dec << std::endl;
+                    break;
+            }
+        #endif
 
         return true;
     }
diff --git a/src/osgUtil/RenderStage.cpp b/src/osgUtil/RenderStage.cpp
index 7b78430d4..1f83bcb37 100644
--- a/src/osgUtil/RenderStage.cpp
+++ b/src/osgUtil/RenderStage.cpp
@@ -886,16 +886,8 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b
 
     if(state.getCheckForGLErrors()!=osg::State::NEVER_CHECK_GL_ERRORS)
     {
-        GLenum errorNo = glGetError();
-        if (errorNo!=GL_NO_ERROR)
+        if (state.checkGLErrors("after RenderBin::draw(..)"))
         {
-#ifdef OSG_GLU_AVAILABLE
-            const char* error = (char*)gluErrorString(errorNo);
-            if (error)  osg::notify(osg::NOTICE)<<"Warning: detected OpenGL error '"<<error<<"' after RenderBin::draw(,)"<<std::endl;
-            else        osg::notify(osg::NOTICE)<<"Warning: detected OpenGL errorNo= 0x"<<std::hex<<errorNo<<" after RenderBin::draw(,)"<<std::dec<<std::endl;
-#else
-            osg::notify(osg::NOTICE)<<"Warning: detected OpenGL errorNo= 0x"<<std::hex<<errorNo<<" after RenderBin::draw(,)"<<std::dec<<std::endl;
-#endif
             if ( fbo_ext )
             {
                 GLenum fbstatus = fbo_ext->glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);