X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=glquake.h;h=38ec3d7c0f271c75aeb34714aea1d6bf1f9e40a0;hb=1da6c44635f21581e349b289a47c5f7fc715b398;hp=781eb3100947ce16fb0ffc45755ea7a2d8a96300;hpb=121152f1632170629122559482a298ea8b3aaf75;p=xonotic%2Fdarkplaces.git diff --git a/glquake.h b/glquake.h index 781eb310..38ec3d7c 100644 --- a/glquake.h +++ b/glquake.h @@ -318,15 +318,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 @@ -445,21 +439,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 @@ -512,14 +491,14 @@ 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); +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) @@ -658,6 +637,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 @@ -731,7 +716,6 @@ extern void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf b 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); @@ -741,9 +725,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); @@ -761,44 +742,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); @@ -807,9 +754,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); @@ -845,7 +789,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 @@ -894,7 +837,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 @@ -1123,11 +1065,11 @@ extern void (GLAPIENTRY *qglBlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactor #ifdef DEBUGGL #ifdef USE_GLES2 -#define CHECKGLERROR {if (gl_paranoid.integer){if (gl_printcheckerror.integer) Con_Printf("CHECKGLERROR at %s:%d\n", __FILE__, __LINE__);errornumber = glGetError();if (errornumber) GL_PrintError(errornumber, __FILE__, __LINE__);}} +#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__);errornumber = qglGetError ? qglGetError() : 0;if (errornumber) GL_PrintError(errornumber, __FILE__, __LINE__);}} +#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 errornumber; +extern int gl_errornumber; void GL_PrintError(int errornumber, const char *filename, int linenumber); #else #define CHECKGLERROR @@ -1151,14 +1093,11 @@ 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 qglBindBuffer glBindBuffer #define qglBindFramebuffer glBindFramebuffer #define qglBindRenderbuffer glBindRenderbuffer #define qglBindTexture glBindTexture @@ -1171,11 +1110,7 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber); #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 @@ -1185,7 +1120,7 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber); #define qglCopyTexSubImage2D glCopyTexSubImage2D #define qglCopyTexSubImage3D glCopyTexSubImage3D #define qglCullFace glCullFace -#define qglDeleteBuffersARB glDeleteBuffers +#define qglDeleteBuffers glDeleteBuffers #define qglDeleteFramebuffers glDeleteFramebuffers #define qglDeleteProgram glDeleteProgram #define qglDeleteShader glDeleteShader @@ -1197,24 +1132,20 @@ void GL_PrintError(int errornumber, const char *filename, int linenumber); #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 qglFramebufferRenderbuffer glFramebufferRenderbuffer #define qglFramebufferTexture2D glFramebufferTexture2D #define qglFramebufferTexture3DEXT glFramebufferTexture3D -#define qglGenBuffersARB glGenBuffers +#define qglGenBuffers glGenBuffers #define qglGenFramebuffers glGenFramebuffers //#define qglGenQueriesARB glGenQueries #define qglGenRenderbuffers glGenRenderbuffers @@ -1246,21 +1177,11 @@ 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 qglRenderbufferStorage glRenderbufferStorage @@ -1271,14 +1192,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 @@ -1307,11 +1220,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