Removed GLState and GLStateManager classes from tilebuf.cc/h and moved them to the new glwrapper files. Removed SDL_opengl from these files and instead have them call static members of the GLStateManager class.

1 files changed, 4 insertions, 23 deletions

diff --git a/crawl-ref/source/tilebuf.h b/crawl-ref/source/tilebuf.h
index 0b1627fee0..998913e2af 100644
--- a/crawl-ref/source/tilebuf.h
+++ b/crawl-ref/source/tilebuf.h
@@ -8,33 +8,14 @@
 
 #include "tiles.h"
 
+#ifdef USE_GL
+#include "glwrapper.h"
+#endif
+
 // This struct defines all of the state that any particular rendering needs.
 // If other rendering states are needed, they should be added here so that
 // they do not introduce unneeded side effects for other parts of the code
 // that have not thought about turning that new state off.
-struct GLState
-{
-    GLState();
-
-    // vertex arrays
-    bool array_vertex;
-    bool array_texcoord;
-    bool array_colour;
-
-    // render state
-    bool blend;
-    bool texture;
-    bool depthtest;
-    bool alphatest;
-    unsigned char alpharef;
-};
-
-class GLStateManager
-{
-public:
-    static void init();
-    static void set(const GLState& state);
-};
 
 class FTFont;
 class formatted_string;