rewrote memory system entirely (hunk, cache, and zone are gone, memory pools replaced...

[xonotic/darkplaces.git] / glquake.h

diff --git a/glquake.h b/glquake.h
index be414912de626a7add5b4ea89ca4e0b8d3287d74..40b440635e576e5ec99d4770c43d72d615ca77fd 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -45,15 +45,6 @@ extern void GL_EndRendering (void);
 
 extern float   gldepthmin, gldepthmax;
 
-typedef struct
-{
-       float   x, y, z;
-       float   s, t;
-       float   r, g, b;
-} glvert_t;
-
-extern glvert_t glv;
-
 //====================================================
 
 extern const char *gl_vendor;
@@ -71,14 +62,14 @@ extern      const char *gl_extensions;
 #endif
 
 // GL_ARB_multitexture
-extern int gl_mtexable;
+extern int gl_textureunits;
 extern void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
 extern void (GLAPIENTRY *qglActiveTexture) (GLenum);
 extern void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 #ifndef GL_ACTIVE_TEXTURE_ARB
 #define GL_ACTIVE_TEXTURE_ARB                  0x84E0
 #define GL_CLIENT_ACTIVE_TEXTURE_ARB   0x84E1
-#define GL_MAX_TEXTURES_UNITS_ARB              0x84E2
+#define GL_MAX_TEXTURE_UNITS_ARB               0x84E2
 #define GL_TEXTURE0_ARB                                        0x84C0
 #define GL_TEXTURE1_ARB                                        0x84C1
 #define GL_TEXTURE2_ARB                                        0x84C2
@@ -154,3 +145,13 @@ extern cvar_t gl_combine;
 //#endif
 
 #endif
+
+//#define DEBUGGL
+
+#ifdef DEBUGGL
+#define CHECKGLERROR if ((errornumber = glGetError())) GL_PrintError(errornumber, __FILE__, __LINE__);
+extern int errornumber;
+void GL_PrintError(int errornumber, char *filename, int linenumber);
+#else
+#define CHECKGLERROR
+#endif