fix OpenGL erorr bug on XP software renderer; use svn:ignore

[xonotic/netradiant.git] / radiant / qgl.cpp

diff --git a/radiant/qgl.cpp b/radiant/qgl.cpp
index 18fe053260e8d9b25312ac4fdba7634b75d1ceca..ae55e9ff956d0a2e2ee531ef358cf6578b9a574e 100644 (file)
--- a/radiant/qgl.cpp
+++ b/radiant/qgl.cpp
@@ -1599,6 +1599,7 @@ void QGL_sharedContextCreated(OpenGLBinding& table)
   else
   {
     globalOutputStream() << "No Anisotropic filtering available\n";
+       g_maxTextureAnisotropy = 0;
   }
 }
 
@@ -1608,7 +1609,7 @@ void QGL_sharedContextDestroyed(OpenGLBinding& table)
 }
 
 
-void QGL_assertNoErrors()
+void QGL_assertNoErrors(const char *file, int line)
 {
   GLenum error = GlobalOpenGL().m_glGetError();
   while (error != GL_NO_ERROR)
@@ -1616,11 +1617,11 @@ void QGL_assertNoErrors()
     const char* errorString = reinterpret_cast<const char*>(qgluErrorString(error));
     if (error == GL_OUT_OF_MEMORY)
     {
-      ERROR_MESSAGE("OpenGL out of memory error: " << errorString);
+      ERROR_MESSAGE("OpenGL out of memory error at " << file << ":" << line << ": " << errorString);
     }
     else
     {
-      ERROR_MESSAGE("OpenGL error: " << errorString);
+      ERROR_MESSAGE("OpenGL error at " << file << ":" << line << ": " << errorString);
     }
     error = GlobalOpenGL().m_glGetError();
   }