]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - glquake.h
Change MAX_TEXTUREUNITS from 16 to 32 - this fixes a memory corruption that was causi...
[xonotic/darkplaces.git] / glquake.h
index ba27242ed117026117cce1f889de3d69135c7560..4026c29609a25c5cc55940915394622fbb12caa5 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -1,61 +1,37 @@
-/*
-Copyright (C) 1996-1997 Id Software, Inc.
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-*/
-
 #ifndef GLQUAKE_H
 #define GLQUAKE_H
 
+#include <stddef.h>
+
 #ifdef USE_GLES2
 #ifdef __IPHONEOS__
 #include <OpenGLES/ES2/gl.h>
 #else
 #include <SDL_opengles2.h>
 #endif
-// used in R_SetupShader_Generic calls, not actually passed to GL
-#ifndef GL_MODULATE
-#define GL_MODULATE                            0x2100
-#define GL_DECAL                          0x2101
-#define GL_ADD                            0x0104
-#endif
 #endif
 
 // disable data conversion warnings
 
 #ifdef _MSC_VER
-#pragma warning(disable : 4310) // LordHavoc: MSVC++ 2008 x86: cast truncates constant value
-#pragma warning(disable : 4245) // LordHavoc: MSVC++ 2008 x86: 'initializing' : conversion from 'int' to 'unsigned char', signed/unsigned mismatch
-#pragma warning(disable : 4204) // LordHavoc: MSVC++ 2008 x86: nonstandard extension used : non-constant aggregate initializer
-#pragma warning(disable : 4267) // LordHavoc: MSVC++ 2008 x64, conversion from 'size_t' to 'int', possible loss of data
-//#pragma warning(disable : 4244)     // LordHavoc: MSVC++ 4 x86, double/float
-//#pragma warning(disable : 4305)              // LordHavoc: MSVC++ 6 x86, double/float
-//#pragma warning(disable : 4706)              // LordHavoc: MSVC++ 2008 x86, assignment within conditional expression
-//#pragma warning(disable : 4127)              // LordHavoc: MSVC++ 2008 x86, conditional expression is constant
-//#pragma warning(disable : 4100)              // LordHavoc: MSVC++ 2008 x86, unreferenced formal parameter
-//#pragma warning(disable : 4055)              // LordHavoc: MSVC++ 2008 x86, 'type cast' from data pointer   to function pointer
-//#pragma warning(disable : 4054)              // LordHavoc: MSVC++ 2008 x86, 'type cast' from function pointer   to data pointer
+#pragma warning(disable : 4310) // LadyHavoc: MSVC++ 2008 x86: cast truncates constant value
+#pragma warning(disable : 4245) // LadyHavoc: MSVC++ 2008 x86: 'initializing' : conversion from 'int' to 'unsigned char', signed/unsigned mismatch
+#pragma warning(disable : 4204) // LadyHavoc: MSVC++ 2008 x86: nonstandard extension used : non-constant aggregate initializer
+//#pragma warning(disable : 4267) // LadyHavoc: MSVC++ 2008 x64, conversion from 'size_t' to 'int', possible loss of data
+//#pragma warning(disable : 4244) // LadyHavoc: MSVC++ 4 x86, double/float
+//#pragma warning(disable : 4305) // LadyHavoc: MSVC++ 6 x86, double/float
+//#pragma warning(disable : 4706) // LadyHavoc: MSVC++ 2008 x86, assignment within conditional expression
+//#pragma warning(disable : 4127) // LadyHavoc: MSVC++ 2008 x86, conditional expression is constant
+//#pragma warning(disable : 4100) // LadyHavoc: MSVC++ 2008 x86, unreferenced formal parameter
+//#pragma warning(disable : 4055) // LadyHavoc: MSVC++ 2008 x86, 'type cast' from data pointer   to function pointer
+//#pragma warning(disable : 4054) // LadyHavoc: MSVC++ 2008 x86, 'type cast' from function pointer   to data pointer
 #endif
 
 
 //====================================================
 
 #ifndef USE_GLES2
-// wgl uses APIENTRY
+// on Windows this is WINAPI
 #ifndef APIENTRY
 #define APIENTRY
 #endif
@@ -65,58 +41,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define GLAPIENTRY APIENTRY
 #endif
 
-#ifndef GL_PROJECTION
-#include <stddef.h>
-
+#ifndef GL_ZERO
 typedef unsigned int GLenum;
 typedef unsigned char GLboolean;
 typedef unsigned int GLbitfield;
 typedef void GLvoid;
-// 1-byte signed
 typedef signed char GLbyte;
-// 2-byte signed
 typedef short GLshort;
-// 4-byte signed
 typedef int GLint;
-// 1-byte unsigned
 typedef unsigned char GLubyte;
-// 2-byte unsigned
 typedef unsigned short GLushort;
-// 4-byte unsigned
 typedef unsigned int GLuint;
-// 4-byte signed
 typedef int GLsizei;
-// single precision float
 typedef float GLfloat;
-// single precision float in [0,1]
 typedef float GLclampf;
-// double precision float
 typedef double GLdouble;
-// double precision float in [0,1]
 typedef double GLclampd;
-// int whose size is the same as a pointer (?)
 typedef ptrdiff_t GLintptrARB;
-// int whose size is the same as a pointer (?)
 typedef ptrdiff_t GLsizeiptrARB;
 
-#define GL_MODELVIEW                           0x1700
-#define GL_PROJECTION                          0x1701
-#define GL_TEXTURE                             0x1702
-#define GL_MATRIX_MODE                         0x0BA0
-#define GL_MODELVIEW_MATRIX                    0x0BA6
-#define GL_PROJECTION_MATRIX                   0x0BA7
-#define GL_TEXTURE_MATRIX                      0x0BA8
-
+#define GL_STEREO                                      0x0C33
 #define GL_DONT_CARE                           0x1100
 #define GL_FASTEST                                     0x1101
 #define GL_NICEST                                      0x1102
-
 #define GL_DEPTH_TEST                          0x0B71
-
 #define GL_CULL_FACE                           0x0B44
-
 #define GL_BLEND                               0x0BE2
-#define GL_ALPHA_TEST                  0x0BC0
 
 #define GL_ZERO                                        0x0
 #define GL_ONE                                 0x1
@@ -134,24 +84,15 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_CONSTANT_ALPHA                      0x8003
 #define GL_ONE_MINUS_CONSTANT_ALPHA            0x8004
 
-#define GL_TEXTURE_ENV                         0x2300
-#define GL_TEXTURE_ENV_MODE                    0x2200
-#define GL_TEXTURE_1D                          0x0DE0
 #define GL_TEXTURE_2D                          0x0DE1
 #define GL_TEXTURE_WRAP_S                      0x2802
 #define GL_TEXTURE_WRAP_T                      0x2803
 #define GL_TEXTURE_WRAP_R                      0x8072
-#define GL_TEXTURE_BORDER_COLOR                        0x1004
 #define GL_TEXTURE_MAG_FILTER                  0x2800
 #define GL_TEXTURE_MIN_FILTER                  0x2801
 #define GL_PACK_ALIGNMENT                      0x0D05
 #define GL_UNPACK_ALIGNMENT                    0x0CF5
-#define GL_TEXTURE_BINDING_1D                   0x8068
-#define GL_TEXTURE_BINDING_2D                   0x8069
 #define GL_TEXTURE_INTERNAL_FORMAT             0x1003
-#define GL_TEXTURE_MIN_LOD                     0x813A
-#define GL_TEXTURE_MAX_LOD                     0x813B
-#define GL_TEXTURE_BASE_LEVEL                  0x813C
 #define GL_TEXTURE_MAX_LEVEL                   0x813D
 
 #define GL_NEAREST                             0x2600
@@ -164,23 +105,10 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_LINE                                        0x1B01
 #define GL_FILL                                        0x1B02
 
-#define GL_ADD                                 0x0104
-#define GL_DECAL                               0x2101
-#define GL_MODULATE                            0x2100
-
 #define GL_REPEAT                              0x2901
 #define GL_CLAMP                               0x2900
 
-#define GL_POINTS                              0x0000
-#define GL_LINES                               0x0001
-#define GL_LINE_LOOP                   0x0002
-#define GL_LINE_STRIP                  0x0003
 #define GL_TRIANGLES                   0x0004
-#define GL_TRIANGLE_STRIP              0x0005
-#define GL_TRIANGLE_FAN                        0x0006
-#define GL_QUADS                               0x0007
-#define GL_QUAD_STRIP                  0x0008
-#define GL_POLYGON                             0x0009
 
 #define GL_FALSE                               0x0
 #define GL_TRUE                                        0x1
@@ -193,16 +121,6 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_UNSIGNED_INT                                0x1405
 #define GL_FLOAT                               0x1406
 #define GL_DOUBLE                              0x140A
-#define GL_2_BYTES                             0x1407
-#define GL_3_BYTES                             0x1408
-#define GL_4_BYTES                             0x1409
-
-#define GL_VERTEX_ARRAY                                0x8074
-#define GL_NORMAL_ARRAY                                0x8075
-#define GL_COLOR_ARRAY                         0x8076
-//#define GL_INDEX_ARRAY                               0x8077
-#define GL_TEXTURE_COORD_ARRAY                 0x8078
-//#define GL_EDGE_FLAG_ARRAY                   0x8079
 
 #define GL_NONE                                        0
 #define GL_FRONT_LEFT                  0x0400
@@ -214,10 +132,6 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_LEFT                                        0x0406
 #define GL_RIGHT                               0x0407
 #define GL_FRONT_AND_BACK              0x0408
-#define GL_AUX0                                        0x0409
-#define GL_AUX1                                        0x040A
-#define GL_AUX2                                        0x040B
-#define GL_AUX3                                        0x040C
 
 #define GL_VENDOR                              0x1F00
 #define GL_RENDERER                            0x1F01
@@ -249,13 +163,7 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_ALWAYS                              0x0207
 #define GL_DEPTH_TEST                          0x0B71
 
-#define GL_RED_SCALE                           0x0D14
-#define GL_GREEN_SCALE                         0x0D18
-#define GL_BLUE_SCALE                          0x0D1A
-#define GL_ALPHA_SCALE                         0x0D1C
-
 #define GL_DEPTH_BUFFER_BIT                    0x00000100
-#define GL_ACCUM_BUFFER_BIT                    0x00000200
 #define GL_STENCIL_BUFFER_BIT                  0x00000400
 #define GL_COLOR_BUFFER_BIT                    0x00004000
 
@@ -271,12 +179,6 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_POLYGON_OFFSET_LINE            0x2A02
 #define GL_POLYGON_OFFSET_FILL            0x8037
 
-#define GL_POINT_SMOOTH                         0x0B10
-#define GL_LINE_SMOOTH                          0x0B20
-#define GL_POLYGON_SMOOTH                       0x0B41
-
-#define GL_POLYGON_STIPPLE                0x0B42
-
 #define GL_CLIP_PLANE0                    0x3000
 #define GL_CLIP_PLANE1                    0x3001
 #define GL_CLIP_PLANE2                    0x3002
@@ -305,7 +207,7 @@ typedef ptrdiff_t GLsizeiptrARB;
 #define GL_DEPTH_COMPONENT24_ARB          0x81A6
 #define GL_DEPTH_COMPONENT32_ARB          0x81A7
 #define GL_TEXTURE_DEPTH_SIZE_ARB         0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
+//#define GL_DEPTH_TEXTURE_MODE_ARB         0x884B
 #endif
 
 // GL_ARB_shadow
@@ -316,15 +218,9 @@ typedef ptrdiff_t GLsizeiptrARB;
 #endif
 
 // GL_ARB_multitexture
-extern void (GLAPIENTRY *qglMultiTexCoord1f) (GLenum, GLfloat);
-extern void (GLAPIENTRY *qglMultiTexCoord2f) (GLenum, GLfloat, GLfloat);
-extern void (GLAPIENTRY *qglMultiTexCoord3f) (GLenum, GLfloat, GLfloat, GLfloat);
-extern void (GLAPIENTRY *qglMultiTexCoord4f) (GLenum, GLfloat, GLfloat, GLfloat, GLfloat);
 extern void (GLAPIENTRY *qglActiveTexture) (GLenum);
-extern void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 #ifndef GL_ACTIVE_TEXTURE
 #define GL_ACTIVE_TEXTURE                      0x84E0
-#define GL_CLIENT_ACTIVE_TEXTURE       0x84E1
 #define GL_MAX_TEXTURE_UNITS           0x84E2
 #define GL_TEXTURE0                                    0x84C0
 #define GL_TEXTURE1                                    0x84C1
@@ -360,32 +256,6 @@ extern void (GLAPIENTRY *qglClientActiveTexture) (GLenum);
 #define GL_TEXTURE31                           0x84DF
 #endif
 
-// GL_ARB_texture_env_combine
-#ifndef GL_COMBINE
-#define GL_COMBINE                                     0x8570
-#define GL_COMBINE_RGB                         0x8571
-#define GL_COMBINE_ALPHA                       0x8572
-#define GL_SOURCE0_RGB                         0x8580
-#define GL_SOURCE1_RGB                         0x8581
-#define GL_SOURCE2_RGB                         0x8582
-#define GL_SOURCE0_ALPHA                       0x8588
-#define GL_SOURCE1_ALPHA                       0x8589
-#define GL_SOURCE2_ALPHA                       0x858A
-#define GL_OPERAND0_RGB                                0x8590
-#define GL_OPERAND1_RGB                                0x8591
-#define GL_OPERAND2_RGB                                0x8592
-#define GL_OPERAND0_ALPHA                      0x8598
-#define GL_OPERAND1_ALPHA                      0x8599
-#define GL_OPERAND2_ALPHA                      0x859A
-#define GL_RGB_SCALE                           0x8573
-#define GL_ADD_SIGNED                          0x8574
-#define GL_INTERPOLATE                         0x8575
-#define GL_SUBTRACT                                    0x84E7
-#define GL_CONSTANT                                    0x8576
-#define GL_PRIMARY_COLOR                       0x8577
-#define GL_PREVIOUS                                    0x8578
-#endif
-
 #ifndef GL_MAX_ELEMENTS_VERTICES
 #define GL_MAX_ELEMENTS_VERTICES               0x80E8
 #endif
@@ -430,7 +300,7 @@ extern void (GLAPIENTRY *qglCopyTexSubImage3D)(GLenum target, GLint level, GLint
 #define GL_DEPTH_COMPONENT24_ARB       0x81A6
 #define GL_DEPTH_COMPONENT32_ARB       0x81A7
 #define GL_TEXTURE_DEPTH_SIZE_ARB      0x884A
-#define GL_DEPTH_TEXTURE_MODE_ARB      0x884B
+//#define GL_DEPTH_TEXTURE_MODE_ARB      0x884B
 #endif
 
 #ifndef GL_SCISSOR_TEST
@@ -443,21 +313,6 @@ extern void (GLAPIENTRY *qglCopyTexSubImage3D)(GLenum target, GLint level, GLint
 #define GL_CLAMP_TO_EDGE 0x812F
 #endif
 
-//GL_ATI_separate_stencil
-#ifndef GL_STENCIL_BACK_FUNC
-#define GL_STENCIL_BACK_FUNC              0x8800
-#define GL_STENCIL_BACK_FAIL              0x8801
-#define GL_STENCIL_BACK_PASS_DEPTH_FAIL   0x8802
-#define GL_STENCIL_BACK_PASS_DEPTH_PASS   0x8803
-#endif
-extern void (GLAPIENTRY *qglStencilOpSeparate)(GLenum, GLenum, GLenum, GLenum);
-extern void (GLAPIENTRY *qglStencilFuncSeparate)(GLenum, GLenum, GLint, GLuint);
-
-//GL_EXT_stencil_two_side
-#define GL_STENCIL_TEST_TWO_SIDE_EXT      0x8910
-#define GL_ACTIVE_STENCIL_FACE_EXT        0x8911
-extern void (GLAPIENTRY *qglActiveStencilFaceEXT)(GLenum);
-
 //GL_EXT_blend_minmax
 #ifndef GL_FUNC_ADD
 #define GL_FUNC_ADD                   0x8006 // also supplied by GL_blend_subtract
@@ -510,86 +365,113 @@ extern void (GLAPIENTRY *qglBlendEquationEXT)(GLenum); // also supplied by GL_bl
 #define GL_BUFFER_MAPPED              0x88BC
 #define GL_BUFFER_MAP_POINTER         0x88BD
 #endif
-extern void (GLAPIENTRY *qglBindBufferARB) (GLenum target, GLuint buffer);
-extern void (GLAPIENTRY *qglDeleteBuffersARB) (GLsizei n, const GLuint *buffers);
-extern void (GLAPIENTRY *qglGenBuffersARB) (GLsizei n, GLuint *buffers);
-extern GLboolean (GLAPIENTRY *qglIsBufferARB) (GLuint buffer);
-extern GLvoid* (GLAPIENTRY *qglMapBufferARB) (GLenum target, GLenum access);
-extern GLboolean (GLAPIENTRY *qglUnmapBufferARB) (GLenum target);
-extern void (GLAPIENTRY *qglBufferDataARB) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
-extern void (GLAPIENTRY *qglBufferSubDataARB) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
-
-//GL_EXT_framebuffer_object
+extern void (GLAPIENTRY *qglBindBuffer) (GLenum target, GLuint buffer);
+extern void (GLAPIENTRY *qglDeleteBuffers) (GLsizei n, const GLuint *buffers);
+extern void (GLAPIENTRY *qglGenBuffers) (GLsizei n, GLuint *buffers);
+extern GLboolean (GLAPIENTRY *qglIsBuffer) (GLuint buffer);
+extern GLvoid* (GLAPIENTRY *qglMapBuffer) (GLenum target, GLenum access);
+extern GLboolean (GLAPIENTRY *qglUnmapBuffer) (GLenum target);
+extern void (GLAPIENTRY *qglBufferData) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+extern void (GLAPIENTRY *qglBufferSubData) (GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data);
+
+//GL_ARB_framebuffer_object
+// (slight differences from GL_EXT_framebuffer_object as this integrates GL_EXT_packed_depth_stencil)
 #ifndef GL_FRAMEBUFFER
-#define GL_FRAMEBUFFER                                   0x8D40
-#define GL_RENDERBUFFER                                  0x8D41
-#define GL_STENCIL_INDEX1                                0x8D46
-#define GL_STENCIL_INDEX4                                0x8D47
-#define GL_STENCIL_INDEX8                                0x8D48
-#define GL_STENCIL_INDEX16                               0x8D49
-#define GL_RENDERBUFFER_WIDTH                            0x8D42
-#define GL_RENDERBUFFER_HEIGHT                           0x8D43
-#define GL_RENDERBUFFER_INTERNAL_FORMAT                  0x8D44
-#define GL_RENDERBUFFER_RED_SIZE                         0x8D50
-#define GL_RENDERBUFFER_GREEN_SIZE                       0x8D51
-#define GL_RENDERBUFFER_BLUE_SIZE                        0x8D52
-#define GL_RENDERBUFFER_ALPHA_SIZE                       0x8D53
-#define GL_RENDERBUFFER_DEPTH_SIZE                       0x8D54
-#define GL_RENDERBUFFER_STENCIL_SIZE                     0x8D55
+#define GL_FRAMEBUFFER                     0x8D40
+#define GL_READ_FRAMEBUFFER                0x8CA8
+#define GL_DRAW_FRAMEBUFFER                0x8CA9
+#define GL_RENDERBUFFER                    0x8D41
+#define GL_STENCIL_INDEX1                  0x8D46
+#define GL_STENCIL_INDEX4                  0x8D47
+#define GL_STENCIL_INDEX8                  0x8D48
+#define GL_STENCIL_INDEX16                 0x8D49
+#define GL_RENDERBUFFER_WIDTH              0x8D42
+#define GL_RENDERBUFFER_HEIGHT             0x8D43
+#define GL_RENDERBUFFER_INTERNAL_FORMAT    0x8D44
+#define GL_RENDERBUFFER_RED_SIZE           0x8D50
+#define GL_RENDERBUFFER_GREEN_SIZE         0x8D51
+#define GL_RENDERBUFFER_BLUE_SIZE          0x8D52
+#define GL_RENDERBUFFER_ALPHA_SIZE         0x8D53
+#define GL_RENDERBUFFER_DEPTH_SIZE         0x8D54
+#define GL_RENDERBUFFER_STENCIL_SIZE       0x8D55
+#define GL_RENDERBUFFER_SAMPLES            0x8CAB
 #define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE            0x8CD0
 #define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME            0x8CD1
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL          0x8CD2
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE  0x8CD3
-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET     0x8CD4
-#define GL_COLOR_ATTACHMENT0                             0x8CE0
-#define GL_COLOR_ATTACHMENT1                             0x8CE1
-#define GL_COLOR_ATTACHMENT2                             0x8CE2
-#define GL_COLOR_ATTACHMENT3                             0x8CE3
-#define GL_COLOR_ATTACHMENT4                             0x8CE4
-#define GL_COLOR_ATTACHMENT5                             0x8CE5
-#define GL_COLOR_ATTACHMENT6                             0x8CE6
-#define GL_COLOR_ATTACHMENT7                             0x8CE7
-#define GL_COLOR_ATTACHMENT8                             0x8CE8
-#define GL_COLOR_ATTACHMENT9                             0x8CE9
-#define GL_COLOR_ATTACHMENT10                            0x8CEA
-#define GL_COLOR_ATTACHMENT11                            0x8CEB
-#define GL_COLOR_ATTACHMENT12                            0x8CEC
-#define GL_COLOR_ATTACHMENT13                            0x8CED
-#define GL_COLOR_ATTACHMENT14                            0x8CEE
-#define GL_COLOR_ATTACHMENT15                            0x8CEF
-#define GL_DEPTH_ATTACHMENT                              0x8D00
-#define GL_STENCIL_ATTACHMENT                            0x8D20
+#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER          0x8CD4
+#define GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING         0x8210
+#define GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE         0x8211
+#define GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE               0x8212
+#define GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE             0x8213
+#define GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE              0x8214
+#define GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE             0x8215
+#define GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE             0x8216
+#define GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE           0x8217
+#define GL_SRGB                                          0x8C40
+#define GL_UNSIGNED_NORMALIZED                           0x8C17
+#define GL_FRAMEBUFFER_DEFAULT                           0x8218
+#define GL_INDEX                                         0x8222
+#define GL_COLOR_ATTACHMENT0                0x8CE0
+#define GL_COLOR_ATTACHMENT1                0x8CE1
+#define GL_COLOR_ATTACHMENT2                0x8CE2
+#define GL_COLOR_ATTACHMENT3                0x8CE3
+#define GL_COLOR_ATTACHMENT4                0x8CE4
+#define GL_COLOR_ATTACHMENT5                0x8CE5
+#define GL_COLOR_ATTACHMENT6                0x8CE6
+#define GL_COLOR_ATTACHMENT7                0x8CE7
+#define GL_COLOR_ATTACHMENT8                0x8CE8
+#define GL_COLOR_ATTACHMENT9                0x8CE9
+#define GL_COLOR_ATTACHMENT10               0x8CEA
+#define GL_COLOR_ATTACHMENT11               0x8CEB
+#define GL_COLOR_ATTACHMENT12               0x8CEC
+#define GL_COLOR_ATTACHMENT13               0x8CED
+#define GL_COLOR_ATTACHMENT14               0x8CEE
+#define GL_COLOR_ATTACHMENT15               0x8CEF
+#define GL_DEPTH_ATTACHMENT                 0x8D00
+#define GL_STENCIL_ATTACHMENT               0x8D20
+#define GL_DEPTH_STENCIL_ATTACHMENT         0x821A
+#define GL_MAX_SAMPLES                     0x8D57
 #define GL_FRAMEBUFFER_COMPLETE                          0x8CD5
 #define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT             0x8CD6
 #define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT     0x8CD7
-#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS             0x8CD9
-#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS                0x8CDA
 #define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER            0x8CDB
 #define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER            0x8CDC
 #define GL_FRAMEBUFFER_UNSUPPORTED                       0x8CDD
-#define GL_FRAMEBUFFER_BINDING                           0x8CA6
-#define GL_RENDERBUFFER_BINDING                          0x8CA7
-#define GL_MAX_COLOR_ATTACHMENTS                         0x8CDF
-#define GL_MAX_RENDERBUFFER_SIZE                         0x84E8
-#define GL_INVALID_FRAMEBUFFER_OPERATION                 0x0506
+#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE            0x8D56
+#define GL_FRAMEBUFFER_UNDEFINED                         0x8219
+#define GL_FRAMEBUFFER_BINDING             0x8CA6 // alias DRAW_FRAMEBUFFER_BINDING
+#define GL_DRAW_FRAMEBUFFER_BINDING        0x8CA6
+#define GL_READ_FRAMEBUFFER_BINDING        0x8CAA
+#define GL_RENDERBUFFER_BINDING            0x8CA7
+#define GL_MAX_COLOR_ATTACHMENTS           0x8CDF
+#define GL_MAX_RENDERBUFFER_SIZE           0x84E8
+#define GL_INVALID_FRAMEBUFFER_OPERATION   0x0506
+#define GL_DEPTH_STENCIL                              0x84F9
+#define GL_UNSIGNED_INT_24_8                          0x84FA
+#define GL_DEPTH24_STENCIL8                           0x88F0
+#define GL_TEXTURE_STENCIL_SIZE                       0x88F1
 #endif
-extern GLboolean (GLAPIENTRY *qglIsRenderbufferEXT)(GLuint renderbuffer);
-extern void (GLAPIENTRY *qglBindRenderbufferEXT)(GLenum target, GLuint renderbuffer);
-extern void (GLAPIENTRY *qglDeleteRenderbuffersEXT)(GLsizei n, const GLuint *renderbuffers);
-extern void (GLAPIENTRY *qglGenRenderbuffersEXT)(GLsizei n, GLuint *renderbuffers);
-extern void (GLAPIENTRY *qglRenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-extern void (GLAPIENTRY *qglGetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint *params);
-extern GLboolean (GLAPIENTRY *qglIsFramebufferEXT)(GLuint framebuffer);
-extern void (GLAPIENTRY *qglBindFramebufferEXT)(GLenum target, GLuint framebuffer);
-extern void (GLAPIENTRY *qglDeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers);
-extern void (GLAPIENTRY *qglGenFramebuffersEXT)(GLsizei n, GLuint *framebuffers);
-extern GLenum (GLAPIENTRY *qglCheckFramebufferStatusEXT)(GLenum target);
-//extern void (GLAPIENTRY *qglFramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-extern void (GLAPIENTRY *qglFramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
-extern void (GLAPIENTRY *qglFramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset);
-extern void (GLAPIENTRY *qglFramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
-extern void (GLAPIENTRY *qglGetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint *params);
-extern void (GLAPIENTRY *qglGenerateMipmapEXT)(GLenum target);
+extern GLboolean (GLAPIENTRY *qglIsRenderbuffer)(GLuint renderbuffer);
+extern GLvoid (GLAPIENTRY *qglBindRenderbuffer)(GLenum target, GLuint renderbuffer);
+extern GLvoid (GLAPIENTRY *qglDeleteRenderbuffers)(GLsizei n, const GLuint *renderbuffers);
+extern GLvoid (GLAPIENTRY *qglGenRenderbuffers)(GLsizei n, GLuint *renderbuffers);
+extern GLvoid (GLAPIENTRY *qglRenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
+extern GLvoid (GLAPIENTRY *qglRenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
+extern GLvoid (GLAPIENTRY *qglGetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint *params);
+extern GLboolean (GLAPIENTRY *qglIsFramebuffer)(GLuint framebuffer);
+extern GLvoid (GLAPIENTRY *qglBindFramebuffer)(GLenum target, GLuint framebuffer);
+extern GLvoid (GLAPIENTRY *qglDeleteFramebuffers)(GLsizei n, const GLuint *framebuffers);
+extern GLvoid (GLAPIENTRY *qglGenFramebuffers)(GLsizei n, GLuint *framebuffers);
+extern GLenum (GLAPIENTRY *qglCheckFramebufferStatus)(GLenum target);
+extern GLvoid (GLAPIENTRY *qglFramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+extern GLvoid (GLAPIENTRY *qglFramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level);
+extern GLvoid (GLAPIENTRY *qglFramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint layer);
+extern GLvoid (GLAPIENTRY *qglFramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
+extern GLvoid (GLAPIENTRY *qglFramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer);
+extern GLvoid (GLAPIENTRY *qglGetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint *params);
+extern GLvoid (GLAPIENTRY *qglBlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+extern GLvoid (GLAPIENTRY *qglGenerateMipmap)(GLenum target);
 
 // GL_ARB_draw_buffers
 #ifndef GL_MAX_DRAW_BUFFERS_ARB
@@ -629,6 +511,12 @@ extern void (GLAPIENTRY *qglDrawBuffersARB)(GLsizei n, const GLenum *bufs);
 #define GL_LUMINANCE_ALPHA16F_ARB                            0x881F
 #endif
 
+// GL_ARB_half_float_pixel
+#ifndef GL_HALF_FLOAT_ARB
+typedef unsigned short GLhalfARB;
+#define GL_HALF_FLOAT_ARB                                    0x140B
+#endif
+
 // GL_EXT_texture_sRGB
 #ifndef GL_SRGB_EXT
 #define GL_SRGB_EXT                                          0x8C40
@@ -649,13 +537,59 @@ extern void (GLAPIENTRY *qglDrawBuffersARB)(GLsizei n, const GLenum *bufs);
 #define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT               0x8C4F
 #endif
 
+// GL_ARB_uniform_buffer_object
+#ifndef GL_UNIFORM_BUFFER
+#define GL_UNIFORM_BUFFER                                    0x8A11
+#define GL_UNIFORM_BUFFER_BINDING                            0x8A28
+#define GL_UNIFORM_BUFFER_START                              0x8A29
+#define GL_UNIFORM_BUFFER_SIZE                               0x8A2A
+#define GL_MAX_VERTEX_UNIFORM_BLOCKS                         0x8A2B
+#define GL_MAX_GEOMETRY_UNIFORM_BLOCKS                       0x8A2C
+#define GL_MAX_FRAGMENT_UNIFORM_BLOCKS                       0x8A2D
+#define GL_MAX_COMBINED_UNIFORM_BLOCKS                       0x8A2E
+#define GL_MAX_UNIFORM_BUFFER_BINDINGS                       0x8A2F
+#define GL_MAX_UNIFORM_BLOCK_SIZE                            0x8A30
+#define GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS            0x8A31
+#define GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS          0x8A32
+#define GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS          0x8A33
+#define GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT                   0x8A34
+#define GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH              0x8A35
+#define GL_ACTIVE_UNIFORM_BLOCKS                             0x8A36
+#define GL_UNIFORM_TYPE                                      0x8A37
+#define GL_UNIFORM_SIZE                                      0x8A38
+#define GL_UNIFORM_NAME_LENGTH                               0x8A39
+#define GL_UNIFORM_BLOCK_INDEX                               0x8A3A
+#define GL_UNIFORM_OFFSET                                    0x8A3B
+#define GL_UNIFORM_ARRAY_STRIDE                              0x8A3C
+#define GL_UNIFORM_MATRIX_STRIDE                             0x8A3D
+#define GL_UNIFORM_IS_ROW_MAJOR                              0x8A3E
+#define GL_UNIFORM_BLOCK_BINDING                             0x8A3F
+#define GL_UNIFORM_BLOCK_DATA_SIZE                           0x8A40
+#define GL_UNIFORM_BLOCK_NAME_LENGTH                         0x8A41
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS                     0x8A42
+#define GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES              0x8A43
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER         0x8A44
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER       0x8A45
+#define GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER       0x8A46
+#define GL_INVALID_INDEX                                     0xFFFFFFFFu
+#endif
+extern void (GLAPIENTRY *qglGetUniformIndices)(GLuint program, GLsizei uniformCount, const char** uniformNames, GLuint* uniformIndices);
+extern void (GLAPIENTRY *qglGetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params);
+extern void (GLAPIENTRY *qglGetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei* length, char* uniformName);
+extern GLuint (GLAPIENTRY *qglGetUniformBlockIndex)(GLuint program, const char* uniformBlockName);
+extern void (GLAPIENTRY *qglGetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname,  GLint* params);
+extern void (GLAPIENTRY *qglGetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, char* uniformBlockName);
+extern void (GLAPIENTRY *qglBindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptrARB offset, GLsizeiptrARB size);
+extern void (GLAPIENTRY *qglBindBufferBase)(GLenum target, GLuint index, GLuint buffer);
+extern void (GLAPIENTRY *qglGetIntegeri_v)(GLenum target, GLuint index, GLint* data);
+extern void (GLAPIENTRY *qglUniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
+
 extern void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height);
 
 extern void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 
 extern void (GLAPIENTRY *qglClear)(GLbitfield mask);
 
-extern void (GLAPIENTRY *qglAlphaFunc)(GLenum func, GLclampf ref);
 extern void (GLAPIENTRY *qglBlendFunc)(GLenum sfactor, GLenum dfactor);
 extern void (GLAPIENTRY *qglCullFace)(GLenum mode);
 
@@ -665,9 +599,6 @@ extern void (GLAPIENTRY *qglEnable)(GLenum cap);
 extern void (GLAPIENTRY *qglDisable)(GLenum cap);
 extern GLboolean (GLAPIENTRY *qglIsEnabled)(GLenum cap);
 
-extern void (GLAPIENTRY *qglEnableClientState)(GLenum cap);
-extern void (GLAPIENTRY *qglDisableClientState)(GLenum cap);
-
 extern void (GLAPIENTRY *qglGetBooleanv)(GLenum pname, GLboolean *params);
 extern void (GLAPIENTRY *qglGetDoublev)(GLenum pname, GLdouble *params);
 extern void (GLAPIENTRY *qglGetFloatv)(GLenum pname, GLfloat *params);
@@ -685,44 +616,10 @@ extern void (GLAPIENTRY *qglDepthRange)(GLclampd near_val, GLclampd far_val);
 extern void (GLAPIENTRY *qglDepthRangef)(GLclampf near_val, GLclampf far_val);
 extern void (GLAPIENTRY *qglColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
 
-extern void (GLAPIENTRY *qglDrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices);
 extern void (GLAPIENTRY *qglDrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices);
 extern void (GLAPIENTRY *qglDrawArrays)(GLenum mode, GLint first, GLsizei count);
-extern void (GLAPIENTRY *qglVertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglNormalPointer)(GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglTexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr);
-extern void (GLAPIENTRY *qglArrayElement)(GLint i);
-
-extern void (GLAPIENTRY *qglColor4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
-extern void (GLAPIENTRY *qglColor4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha);
-extern void (GLAPIENTRY *qglTexCoord1f)(GLfloat s);
-extern void (GLAPIENTRY *qglTexCoord2f)(GLfloat s, GLfloat t);
-extern void (GLAPIENTRY *qglTexCoord3f)(GLfloat s, GLfloat t, GLfloat r);
-extern void (GLAPIENTRY *qglTexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q);
-extern void (GLAPIENTRY *qglVertex2f)(GLfloat x, GLfloat y);
-extern void (GLAPIENTRY *qglVertex3f)(GLfloat x, GLfloat y, GLfloat z);
-extern void (GLAPIENTRY *qglVertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-extern void (GLAPIENTRY *qglBegin)(GLenum mode);
-extern void (GLAPIENTRY *qglEnd)(void);
-
-extern void (GLAPIENTRY *qglMatrixMode)(GLenum mode);
-//extern void (GLAPIENTRY *qglOrtho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val);
-//extern void (GLAPIENTRY *qglFrustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble near_val, GLdouble far_val);
+
 extern void (GLAPIENTRY *qglViewport)(GLint x, GLint y, GLsizei width, GLsizei height);
-//extern void (GLAPIENTRY *qglPushMatrix)(void);
-//extern void (GLAPIENTRY *qglPopMatrix)(void);
-extern void (GLAPIENTRY *qglLoadIdentity)(void);
-//extern void (GLAPIENTRY *qglLoadMatrixd)(const GLdouble *m);
-extern void (GLAPIENTRY *qglLoadMatrixf)(const GLfloat *m);
-//extern void (GLAPIENTRY *qglMultMatrixd)(const GLdouble *m);
-//extern void (GLAPIENTRY *qglMultMatrixf)(const GLfloat *m);
-//extern void (GLAPIENTRY *qglRotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z);
-//extern void (GLAPIENTRY *qglRotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z);
-//extern void (GLAPIENTRY *qglScaled)(GLdouble x, GLdouble y, GLdouble z);
-//extern void (GLAPIENTRY *qglScalef)(GLfloat x, GLfloat y, GLfloat z);
-//extern void (GLAPIENTRY *qglTranslated)(GLdouble x, GLdouble y, GLdouble z);
-//extern void (GLAPIENTRY *qglTranslatef)(GLfloat x, GLfloat y, GLfloat z);
 
 extern void (GLAPIENTRY *qglReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels);
 
@@ -731,9 +628,6 @@ extern void (GLAPIENTRY *qglStencilMask)(GLuint mask);
 extern void (GLAPIENTRY *qglStencilOp)(GLenum fail, GLenum zfail, GLenum zpass);
 extern void (GLAPIENTRY *qglClearStencil)(GLint s);
 
-extern void (GLAPIENTRY *qglTexEnvf)(GLenum target, GLenum pname, GLfloat param);
-extern void (GLAPIENTRY *qglTexEnvfv)(GLenum target, GLenum pname, const GLfloat *params);
-extern void (GLAPIENTRY *qglTexEnvi)(GLenum target, GLenum pname, GLint param);
 extern void (GLAPIENTRY *qglTexParameterf)(GLenum target, GLenum pname, GLfloat param);
 extern void (GLAPIENTRY *qglTexParameterfv)(GLenum target, GLenum pname, GLfloat *params);
 extern void (GLAPIENTRY *qglTexParameteri)(GLenum target, GLenum pname, GLint param);
@@ -769,7 +663,6 @@ extern void (GLAPIENTRY *qglPolygonMode)(GLenum face, GLenum mode);
 //extern void (GLAPIENTRY *qglGetClipPlane)(GLenum plane, GLdouble *equation);
 
 //[515]: added on 29.07.2005
-extern void (GLAPIENTRY *qglLineWidth)(GLfloat width);
 extern void (GLAPIENTRY *qglPointSize)(GLfloat size);
 
 // GL 2.0 shader objects
@@ -818,7 +711,6 @@ extern void (GLAPIENTRY *qglGetActiveUniform)(GLuint programObj, GLuint index, G
 extern void (GLAPIENTRY *qglGetUniformfv)(GLuint programObj, GLint location, GLfloat *params);
 extern void (GLAPIENTRY *qglGetUniformiv)(GLuint programObj, GLint location, GLint *params);
 extern void (GLAPIENTRY *qglGetShaderSource)(GLuint obj, GLsizei maxLength, GLsizei *length, GLchar *source);
-extern void (GLAPIENTRY *qglPolygonStipple)(const GLubyte *mask);
 #ifndef GL_PROGRAM_OBJECT
 #define GL_PROGRAM_OBJECT                                      0x8B40
 #define GL_DELETE_STATUS                                       0x8B80
@@ -995,6 +887,14 @@ extern void (GLAPIENTRY *qglGetQueryObjectuivARB)(GLuint qid, GLenum pname, GLui
 #define GL_QUERY_RESULT_AVAILABLE_ARB                     0x8867
 #endif
 
+// GL_ARB_query_buffer_object
+#ifndef GL_QUERY_BUFFER_ARB
+#define GL_QUERY_BUFFER_ARB                               0x9192
+#define GL_QUERY_BUFFER_BINDING_ARB                       0x9193
+#define GL_QUERY_RESULT_NO_WAIT_ARB                       0x9194
+#define GL_QUERY_BUFFER_BARRIER_BIT_ARB                   0x00008000
+#endif
+
 // GL_EXT_bgr
 #define GL_BGR                                 0x80E0
 
@@ -1024,13 +924,26 @@ extern void (GLAPIENTRY *qglPointSize)(GLfloat size);
 #define GL_UNSIGNED_INT_24_8_EXT        0x84FA
 #define GL_DEPTH24_STENCIL8_EXT         0x88F0
 
+//GL_EXT_blend_func_separate
+#ifndef GL_BLEND_DST_RGB
+#define GL_BLEND_DST_RGB                  0x80C8
+#define GL_BLEND_SRC_RGB                  0x80C9
+#define GL_BLEND_DST_ALPHA                0x80CA
+#define GL_BLEND_SRC_ALPHA                0x80CB
+#endif
+extern void (GLAPIENTRY *qglBlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+
 #endif
 
 #define DEBUGGL
 
 #ifdef DEBUGGL
-#define CHECKGLERROR {if (gl_paranoid.integer){if (gl_printcheckerror.integer) Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__);errornumber = qglGetError ? qglGetError() : 0;if (errornumber) GL_PrintError(errornumber, __FILE__, __LINE__);}}
-extern int errornumber;
+#ifdef USE_GLES2
+#define CHECKGLERROR {if (gl_paranoid.integer){if (gl_printcheckerror.integer) Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__);gl_errornumber = glGetError();if (gl_errornumber) GL_PrintError(gl_errornumber, __FILE__, __LINE__);}}
+#else
+#define CHECKGLERROR {if (gl_paranoid.integer){if (gl_printcheckerror.integer) Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__);gl_errornumber = qglGetError ? qglGetError() : 0;if (gl_errornumber) GL_PrintError(gl_errornumber, __FILE__, __LINE__);}}
+#endif
+extern int gl_errornumber;
 void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #else
 #define CHECKGLERROR
@@ -1043,7 +956,7 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 //#define qglIsQueryARB glIsQuery
 #define qglIsRenderbufferEXT glIsRenderbuffer
 //#define qglUnmapBufferARB glUnmapBuffer
-#define qglCheckFramebufferStatusEXT glCheckFramebufferStatus
+#define qglCheckFramebufferStatus glCheckFramebufferStatus
 #define qglGetError glGetError
 #define qglCreateProgram glCreateProgram
 #define qglCreateShader glCreateShader
@@ -1054,30 +967,24 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #define qglGetString glGetString
 //#define qglActiveStencilFaceEXT glActiveStencilFace
 #define qglActiveTexture glActiveTexture
-#define qglAlphaFunc glAlphaFunc
-#define qglArrayElement glArrayElement
 #define qglAttachShader glAttachShader
-//#define qglBegin glBegin
 //#define qglBeginQueryARB glBeginQuery
 #define qglBindAttribLocation glBindAttribLocation
 //#define qglBindFragDataLocation glBindFragDataLocation
-#define qglBindBufferARB glBindBuffer
-#define qglBindFramebufferEXT glBindFramebuffer
-#define qglBindRenderbufferEXT glBindRenderbuffer
+#define qglBindBuffer glBindBuffer
+#define qglBindFramebuffer glBindFramebuffer
+#define qglBindRenderbuffer glBindRenderbuffer
 #define qglBindTexture glBindTexture
 #define qglBlendEquationEXT glBlendEquation
 #define qglBlendFunc glBlendFunc
+#define qglBlendFuncSeparate glBlendFuncSeparate
 #define qglBufferDataARB glBufferData
 #define qglBufferSubDataARB glBufferSubData
 #define qglClear glClear
 #define qglClearColor glClearColor
 #define qglClearDepthf glClearDepthf
 #define qglClearStencil glClearStencil
-#define qglClientActiveTexture glClientActiveTexture
-#define qglColor4f glColor4f
-#define qglColor4ub glColor4ub
 #define qglColorMask glColorMask
-#define qglColorPointer glColorPointer
 #define qglCompileShader glCompileShader
 #define qglCompressedTexImage2DARB glCompressedTexImage2D
 #define qglCompressedTexImage3DARB glCompressedTexImage3D
@@ -1087,39 +994,35 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #define qglCopyTexSubImage2D glCopyTexSubImage2D
 #define qglCopyTexSubImage3D glCopyTexSubImage3D
 #define qglCullFace glCullFace
-#define qglDeleteBuffersARB glDeleteBuffers
-#define qglDeleteFramebuffersEXT glDeleteFramebuffers
+#define qglDeleteBuffers glDeleteBuffers
+#define qglDeleteFramebuffers glDeleteFramebuffers
 #define qglDeleteProgram glDeleteProgram
 #define qglDeleteShader glDeleteShader
 //#define qglDeleteQueriesARB glDeleteQueries
-#define qglDeleteRenderbuffersEXT glDeleteRenderbuffers
+#define qglDeleteRenderbuffers glDeleteRenderbuffers
 #define qglDeleteTextures glDeleteTextures
 #define qglDepthFunc glDepthFunc
 #define qglDepthMask glDepthMask
 #define qglDepthRangef glDepthRangef
 #define qglDetachShader glDetachShader
 #define qglDisable glDisable
-#define qglDisableClientState glDisableClientState
 #define qglDisableVertexAttribArray glDisableVertexAttribArray
 #define qglDrawArrays glDrawArrays
 //#define qglDrawBuffer glDrawBuffer
 //#define qglDrawBuffersARB glDrawBuffers
 #define qglDrawElements glDrawElements
-//#define qglDrawRangeElements glDrawRangeElements
 #define qglEnable glEnable
-#define qglEnableClientState glEnableClientState
 #define qglEnableVertexAttribArray glEnableVertexAttribArray
-//#define qglEnd glEnd
 //#define qglEndQueryARB glEndQuery
 #define qglFinish glFinish
 #define qglFlush glFlush
-#define qglFramebufferRenderbufferEXT glFramebufferRenderbuffer
-#define qglFramebufferTexture2DEXT glFramebufferTexture2D
+#define qglFramebufferRenderbuffer glFramebufferRenderbuffer
+#define qglFramebufferTexture2D glFramebufferTexture2D
 #define qglFramebufferTexture3DEXT glFramebufferTexture3D
-#define qglGenBuffersARB glGenBuffers
-#define qglGenFramebuffersEXT glGenFramebuffers
+#define qglGenBuffers glGenBuffers
+#define qglGenFramebuffers glGenFramebuffers
 //#define qglGenQueriesARB glGenQueries
-#define qglGenRenderbuffersEXT glGenRenderbuffers
+#define qglGenRenderbuffers glGenRenderbuffers
 #define qglGenTextures glGenTextures
 #define qglGenerateMipmapEXT glGenerateMipmap
 #define qglGetActiveAttrib glGetActiveAttrib
@@ -1148,24 +1051,14 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #define qglGetUniformfv glGetUniformfv
 #define qglGetUniformiv glGetUniformiv
 #define qglHint glHint
-#define qglLineWidth glLineWidth
 #define qglLinkProgram glLinkProgram
-#define qglLoadIdentity glLoadIdentity
-#define qglLoadMatrixf glLoadMatrixf
-#define qglMatrixMode glMatrixMode
-#define qglMultiTexCoord1f glMultiTexCoord1f
-#define qglMultiTexCoord2f glMultiTexCoord2f
-#define qglMultiTexCoord3f glMultiTexCoord3f
-#define qglMultiTexCoord4f glMultiTexCoord4f
-#define qglNormalPointer glNormalPointer
 #define qglPixelStorei glPixelStorei
 #define qglPointSize glPointSize
 //#define qglPolygonMode glPolygonMode
 #define qglPolygonOffset glPolygonOffset
-//#define qglPolygonStipple glPolygonStipple
 #define qglReadBuffer glReadBuffer
 #define qglReadPixels glReadPixels
-#define qglRenderbufferStorageEXT glRenderbufferStorage
+#define qglRenderbufferStorage glRenderbufferStorage
 #define qglScissor glScissor
 #define qglShaderSource glShaderSource
 #define qglStencilFunc glStencilFunc
@@ -1173,14 +1066,6 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #define qglStencilMask glStencilMask
 #define qglStencilOp glStencilOp
 #define qglStencilOpSeparate glStencilOpSeparate
-#define qglTexCoord1f glTexCoord1f
-#define qglTexCoord2f glTexCoord2f
-#define qglTexCoord3f glTexCoord3f
-#define qglTexCoord4f glTexCoord4f
-#define qglTexCoordPointer glTexCoordPointer
-#define qglTexEnvf glTexEnvf
-#define qglTexEnvfv glTexEnvfv
-#define qglTexEnvi glTexEnvi
 #define qglTexImage2D glTexImage2D
 #define qglTexImage3D glTexImage3D
 #define qglTexParameterf glTexParameterf
@@ -1209,11 +1094,7 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #define qglUniformMatrix4fv glUniformMatrix4fv
 #define qglUseProgram glUseProgram
 #define qglValidateProgram glValidateProgram
-#define qglVertex2f glVertex2f
-#define qglVertex3f glVertex3f
-#define qglVertex4f glVertex4f
 #define qglVertexAttribPointer glVertexAttribPointer
-#define qglVertexPointer glVertexPointer
 #define qglViewport glViewport
 #define qglVertexAttrib1f glVertexAttrib1f
 //#define qglVertexAttrib1s glVertexAttrib1s
@@ -1258,4 +1139,3 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber);
 #endif
 
 #endif
-