move more into OGL_Helpers: pulling in GL.h, GLToString

stepmania/src/RageDisplay_OGL_Helpers.cpp

@@ -1,29 +1,50 @@
 #include "global.h"
-
-#define __glext_h_
-
-#if defined(WIN32)
-#include <windows.h>
-#endif
-
-#include <set>
-
-#if !defined(MACOSX)
-# include <GL/gl.h>
-# include <GL/glu.h>
-#else
-# include <OpenGL/gl.h>
-# include <OpenGL/glu.h>
-#endif
-
-#undef __glext_h_
-#include "glext.h"
-
 #include "RageDisplay_OGL_Helpers.h"
+#include "RageUtil.h"
+
 #include "RageLog.h"
 #include "RageUtil.h"
 #include "arch/LowLevelWindow/LowLevelWindow.h"
 
+#include <map>
+#include <set>
+
+namespace
+{
+	map<GLenum, RString> g_Strings;
+	void InitStringMap()
+	{
+		static bool bInitialized = false;
+		if( bInitialized )
+			return;
+		bInitialized = true;
+
+#define X(a) g_Strings[a] = #a;
+		X(GL_RGBA8);	X(GL_RGBA4);	X(GL_RGB5_A1);	X(GL_RGB5);	X(GL_RGBA);	X(GL_RGB);
+		X(GL_BGR);	X(GL_BGRA);
+		X(GL_COLOR_INDEX8_EXT);	X(GL_COLOR_INDEX4_EXT);	X(GL_COLOR_INDEX);
+		X(GL_UNSIGNED_BYTE);	X(GL_UNSIGNED_SHORT_4_4_4_4); X(GL_UNSIGNED_SHORT_5_5_5_1);
+		X(GL_UNSIGNED_SHORT_1_5_5_5_REV);
+		X(GL_INVALID_ENUM); X(GL_INVALID_VALUE); X(GL_INVALID_OPERATION);
+		X(GL_STACK_OVERFLOW); X(GL_STACK_UNDERFLOW); X(GL_OUT_OF_MEMORY);
+#undef X
+	}
+};
+
+void RageDisplay_OGL_Helpers::Init()
+{
+	InitStringMap();
+}
+
+RString RageDisplay_OGL_Helpers::GLToString( GLenum e )
+{
+	if( g_Strings.find(e) != g_Strings.end() )
+		return g_Strings[e];
+
+	return ssprintf( "%i", int(e) );
+}
+
+
 GLExt_t GLExt;
 
 /* Available extensions: */
@@ -192,7 +213,7 @@ void GLExt_t::Load( LowLevelWindow *pWind )
 }
 
 /*
- * Copyright (c) 2002-2005 Glenn Maynard
+ * Copyright (c) 2001-2005 Chris Danford, Glenn Maynard
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a