Imported Upstream version 2.2.0+dfsg

1 files changed, 112 insertions, 130 deletions

diff --git a/src/SFML/Graphics/GLCheck.cpp b/src/SFML/Graphics/GLCheck.cpp
index 4743c8a..0e8f6de 100644
--- a/src/SFML/Graphics/GLCheck.cpp
+++ b/src/SFML/Graphics/GLCheck.cpp
@@ -1,130 +1,112 @@
-////////////////////////////////////////////////////////////

-//

-// SFML - Simple and Fast Multimedia Library

-// Copyright (C) 2007-2013 Laurent Gomila (laurent.gom@gmail.com)

-//

-// This software is provided 'as-is', without any express or implied warranty.

-// In no event will the authors be held liable for any damages arising from the use of this software.

-//

-// Permission is granted to anyone to use this software for any purpose,

-// including commercial applications, and to alter it and redistribute it freely,

-// subject to the following restrictions:

-//

-// 1. The origin of this software must not be misrepresented;

-//    you must not claim that you wrote the original software.

-//    If you use this software in a product, an acknowledgment

-//    in the product documentation would be appreciated but is not required.

-//

-// 2. Altered source versions must be plainly marked as such,

-//    and must not be misrepresented as being the original software.

-//

-// 3. This notice may not be removed or altered from any source distribution.

-//

-////////////////////////////////////////////////////////////

-

-////////////////////////////////////////////////////////////

-// Headers

-////////////////////////////////////////////////////////////

-#include <SFML/Graphics/GLCheck.hpp>

-#include <SFML/System/Err.hpp>

-

-

-namespace sf

-{

-namespace priv

-{

-////////////////////////////////////////////////////////////

-void glCheckError(const char* file, unsigned int line)

-{

-    // Get the last error

-    GLenum errorCode = glGetError();

-

-    if (errorCode != GL_NO_ERROR)

-    {

-        std::string fileString(file);

-        std::string error = "unknown error";

-        std::string description  = "no description";

-

-        // Decode the error code

-        switch (errorCode)

-        {

-            case GL_INVALID_ENUM :

-            {

-                error = "GL_INVALID_ENUM";

-                description = "an unacceptable value has been specified for an enumerated argument";

-                break;

-            }

-

-            case GL_INVALID_VALUE :

-            {

-                error = "GL_INVALID_VALUE";

-                description = "a numeric argument is out of range";

-                break;

-            }

-

-            case GL_INVALID_OPERATION :

-            {

-                error = "GL_INVALID_OPERATION";

-                description = "the specified operation is not allowed in the current state";

-                break;

-            }

-

-            case GL_STACK_OVERFLOW :

-            {

-                error = "GL_STACK_OVERFLOW";

-                description = "this command would cause a stack overflow";

-                break;

-            }

-

-            case GL_STACK_UNDERFLOW :

-            {

-                error = "GL_STACK_UNDERFLOW";

-                description = "this command would cause a stack underflow";

-                break;

-            }

-

-            case GL_OUT_OF_MEMORY :

-            {

-                error = "GL_OUT_OF_MEMORY";

-                description = "there is not enough memory left to execute the command";

-                break;

-            }

-

-            case GL_INVALID_FRAMEBUFFER_OPERATION_EXT :

-            {

-                error = "GL_INVALID_FRAMEBUFFER_OPERATION_EXT";

-                description = "the object bound to FRAMEBUFFER_BINDING_EXT is not \"framebuffer complete\"";

-                break;

-            }

-        }

-

-        // Log the error

-        err() << "An internal OpenGL call failed in "

-              << fileString.substr(fileString.find_last_of("\\/") + 1) << " (" << line << ") : "

-              << error << ", " << description

-              << std::endl;

-    }

-}

-

-

-////////////////////////////////////////////////////////////

-void ensureGlewInit()

-{

-    static bool initialized = false;

-    if (!initialized)

-    {

-        GLenum status = glewInit();

-        if (status == GLEW_OK)

-        {

-            initialized = true;

-        }

-        else

-        {

-            err() << "Failed to initialize GLEW, " << glewGetErrorString(status) << std::endl;

-        }

-    }

-}

-

-} // namespace priv

-

-} // namespace sf

+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2014 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+//    you must not claim that you wrote the original software.
+//    If you use this software in a product, an acknowledgment
+//    in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+//    and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Graphics/GLCheck.hpp>
+#include <SFML/System/Err.hpp>
+
+
+namespace sf
+{
+namespace priv
+{
+////////////////////////////////////////////////////////////
+void glCheckError(const char* file, unsigned int line)
+{
+    // Get the last error
+    GLenum errorCode = glGetError();
+
+    if (errorCode != GL_NO_ERROR)
+    {
+        std::string fileString(file);
+        std::string error = "unknown error";
+        std::string description  = "no description";
+
+        // Decode the error code
+        switch (errorCode)
+        {
+            case GL_INVALID_ENUM:
+            {
+                error = "GL_INVALID_ENUM";
+                description = "an unacceptable value has been specified for an enumerated argument";
+                break;
+            }
+
+            case GL_INVALID_VALUE:
+            {
+                error = "GL_INVALID_VALUE";
+                description = "a numeric argument is out of range";
+                break;
+            }
+
+            case GL_INVALID_OPERATION:
+            {
+                error = "GL_INVALID_OPERATION";
+                description = "the specified operation is not allowed in the current state";
+                break;
+            }
+
+            case GL_STACK_OVERFLOW:
+            {
+                error = "GL_STACK_OVERFLOW";
+                description = "this command would cause a stack overflow";
+                break;
+            }
+
+            case GL_STACK_UNDERFLOW:
+            {
+                error = "GL_STACK_UNDERFLOW";
+                description = "this command would cause a stack underflow";
+                break;
+            }
+
+            case GL_OUT_OF_MEMORY:
+            {
+                error = "GL_OUT_OF_MEMORY";
+                description = "there is not enough memory left to execute the command";
+                break;
+            }
+
+            case GLEXT_GL_INVALID_FRAMEBUFFER_OPERATION:
+            {
+                error = "GL_INVALID_FRAMEBUFFER_OPERATION";
+                description = "the object bound to FRAMEBUFFER_BINDING is not \"framebuffer complete\"";
+                break;
+            }
+        }
+
+        // Log the error
+        err() << "An internal OpenGL call failed in "
+              << fileString.substr(fileString.find_last_of("\\/") + 1) << " (" << line << ") : "
+              << error << ", " << description
+              << std::endl;
+    }
+}
+
+
+} // namespace priv
+
+} // namespace sf