From: <sp...@us...> - 2008-11-02 19:26:40
|
Revision: 746 http://freeglut.svn.sourceforge.net/freeglut/?rev=746&view=rev Author: spanne Date: 2008-11-02 19:26:36 +0000 (Sun, 02 Nov 2008) Log Message: ----------- Do not depend on GLU, it will vanish in the future, at least in its current form. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_misc.c Modified: trunk/freeglut/freeglut/src/freeglut_misc.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_misc.c 2008-11-02 18:42:49 UTC (rev 745) +++ trunk/freeglut/freeglut/src/freeglut_misc.c 2008-11-02 19:26:36 UTC (rev 746) @@ -76,7 +76,42 @@ return 0 ; } +#ifndef GL_INVALID_FRAMEBUFFER_OPERATION +#ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT +#define GL_INVALID_FRAMEBUFFER_OPERATION GL_INVALID_FRAMEBUFFER_OPERATION_EXT +#else +#define GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 +#endif +#endif + +#ifndef GL_TEXTURE_TOO_LARGE +#ifdef GL_TEXTURE_TOO_LARGE_EXT +#define GL_TEXTURE_TOO_LARGE GL_TEXTURE_TOO_LARGE_EXT +#else +#define GL_TEXTURE_TOO_LARGE 0x8065 +#endif +#endif + /* + * A cut-down local version of gluErrorString to avoid depending on GLU. + */ +static const char* fghErrorString( GLenum error ) +{ + switch ( error ) { + case GL_INVALID_ENUM: return "invalid enumerant"; + case GL_INVALID_VALUE: return "invalid value"; + case GL_INVALID_OPERATION: return "invalid operation"; + case GL_STACK_OVERFLOW: return "stack overflow"; + case GL_STACK_UNDERFLOW: return "stack underflow"; + case GL_OUT_OF_MEMORY: return "out of memory"; + case GL_TABLE_TOO_LARGE: return "table too large"; + case GL_INVALID_FRAMEBUFFER_OPERATION: return "invalid framebuffer operation"; + case GL_TEXTURE_TOO_LARGE: return "texture too large"; + default: return "unknown GL error"; + } +} + +/* * This function reports all the OpenGL errors that happened till now */ void FGAPIENTRY glutReportErrors( void ) @@ -84,7 +119,7 @@ GLenum error; FREEGLUT_EXIT_IF_NOT_INITIALISED ( "glutReportErrors" ); while( ( error = glGetError() ) != GL_NO_ERROR ) - fgWarning( "GL error: %s", gluErrorString( error ) ); + fgWarning( "GL error: %s", fghErrorString( error ) ); } /* This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |