This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.5a
in repository iortcw.
commit 48955eb228b71f063e386c66519be7fbfbf1bb83
Author: MAN-AT-ARMS <m4n4t4...@gmail.com>
Date: Mon Sep 12 21:23:08 2016 -0400
All: Some qgl.h cleanup
---
MP/code/rend2/qgl.h | 21 ++++++++++-----------
MP/code/renderer/qgl.h | 21 ++++++++++-----------
SP/code/rend2/qgl.h | 21 ++++++++++-----------
SP/code/renderer/qgl.h | 21 ++++++++++-----------
4 files changed, 40 insertions(+), 44 deletions(-)
diff --git a/MP/code/rend2/qgl.h b/MP/code/rend2/qgl.h
index 8908d82..552e279 100644
--- a/MP/code/rend2/qgl.h
+++ b/MP/code/rend2/qgl.h
@@ -39,12 +39,12 @@ If you have questions concerning this license or the
applicable additional terms
# include <SDL_opengl.h>
#endif
-extern void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s,
GLfloat t );
+extern void (APIENTRYP qglActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s,
GLfloat t);
-extern void ( APIENTRY * qglLockArraysEXT )( GLint, GLint );
-extern void ( APIENTRY * qglUnlockArraysEXT )( void );
+extern void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count);
+extern void (APIENTRYP qglUnlockArraysEXT) (void);
//===========================================================================
@@ -88,13 +88,13 @@ extern void ( APIENTRY * qglUnlockArraysEXT )( void );
#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
#endif
-typedef void ( APIENTRY * PFNGLPNTRIANGLESIATIPROC )( GLenum pname, GLint
param );
-typedef void ( APIENTRY * PFNGLPNTRIANGLESFATIPROC )( GLenum pname, GLfloat
param );
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param);
#endif
//----(SA) added
-extern void ( APIENTRY * qglPNTrianglesiATI )( GLenum pname, GLint param );
-extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum pname, GLfloat param );
+extern void (APIENTRYP qglPNTrianglesiATI)(GLenum pname, GLint param);
+extern void (APIENTRYP qglPNTrianglesfATI)(GLenum pname, GLfloat param);
//----(SA) end
// for NV fog distance
@@ -460,7 +460,6 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define qglVertexPointer glVertexPointer
#define qglViewport glViewport
-
// GL function loader, based on
https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
// OpenGL 1.2, was GL_EXT_draw_range_elements
@@ -570,6 +569,7 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define GL_HALF_FLOAT_ARB 0x140B
#endif
+// GL_EXT_framebuffer_object
#define QGL_EXT_framebuffer_object_PROCS \
GLE(void, BindRenderbufferEXT, GLenum target, GLuint renderbuffer) \
GLE(void, DeleteRenderbuffersEXT, GLsizei n, const GLuint
*renderbuffers) \
@@ -736,4 +736,3 @@ QGL_EXT_direct_state_access_PROCS;
#undef GLE
#endif // __QGL_H__
-
diff --git a/MP/code/renderer/qgl.h b/MP/code/renderer/qgl.h
index 89b8348..8cfac2f 100644
--- a/MP/code/renderer/qgl.h
+++ b/MP/code/renderer/qgl.h
@@ -52,12 +52,12 @@ If you have questions concerning this license or the
applicable additional terms
#endif
#endif
-extern void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s,
GLfloat t );
+extern void (APIENTRYP qglActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s,
GLfloat t);
-extern void ( APIENTRY * qglLockArraysEXT )( GLint, GLint );
-extern void ( APIENTRY * qglUnlockArraysEXT )( void );
+extern void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count);
+extern void (APIENTRYP qglUnlockArraysEXT) (void);
#ifdef USE_OPENGLES
#define GLdouble GLfloat
@@ -113,13 +113,13 @@ extern void myglMultiTexCoord2f( GLenum texture, GLfloat
s, GLfloat t );
#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
#endif
-typedef void ( APIENTRY * PFNGLPNTRIANGLESIATIPROC )( GLenum pname, GLint
param );
-typedef void ( APIENTRY * PFNGLPNTRIANGLESFATIPROC )( GLenum pname, GLfloat
param );
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param);
#endif
//----(SA) added
-extern void ( APIENTRY * qglPNTrianglesiATI )( GLenum pname, GLint param );
-extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum pname, GLfloat param );
+extern void (APIENTRYP qglPNTrianglesiATI)(GLenum pname, GLint param);
+extern void (APIENTRYP qglPNTrianglesfATI)(GLenum pname, GLfloat param);
//----(SA) end
// for NV fog distance
@@ -519,7 +519,6 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define qglVertexPointer glVertexPointer
#define qglViewport glViewport
-
// GL function loader, based on
https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
// OpenGL 1.2, was GL_EXT_draw_range_elements
@@ -629,6 +628,7 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define GL_HALF_FLOAT_ARB 0x140B
#endif
+// GL_EXT_framebuffer_object
#define QGL_EXT_framebuffer_object_PROCS \
GLE(void, BindRenderbufferEXT, GLenum target, GLuint renderbuffer) \
GLE(void, DeleteRenderbuffersEXT, GLsizei n, const GLuint
*renderbuffers) \
@@ -795,4 +795,3 @@ QGL_EXT_direct_state_access_PROCS;
#undef GLE
#endif // __QGL_H__
-
diff --git a/SP/code/rend2/qgl.h b/SP/code/rend2/qgl.h
index 092c0ec..222e0a1 100644
--- a/SP/code/rend2/qgl.h
+++ b/SP/code/rend2/qgl.h
@@ -39,12 +39,12 @@ If you have questions concerning this license or the
applicable additional terms
# include <SDL_opengl.h>
#endif
-extern void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s,
GLfloat t );
+extern void (APIENTRYP qglActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s,
GLfloat t);
-extern void ( APIENTRY * qglLockArraysEXT )( GLint, GLint );
-extern void ( APIENTRY * qglUnlockArraysEXT )( void );
+extern void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count);
+extern void (APIENTRYP qglUnlockArraysEXT) (void);
//===========================================================================
@@ -88,13 +88,13 @@ extern void ( APIENTRY * qglUnlockArraysEXT )( void );
#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
#endif
-typedef void ( APIENTRY * PFNGLPNTRIANGLESIATIPROC )( GLenum pname, GLint
param );
-typedef void ( APIENTRY * PFNGLPNTRIANGLESFATIPROC )( GLenum pname, GLfloat
param );
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param);
#endif
//----(SA) added
-extern void ( APIENTRY * qglPNTrianglesiATI )( GLenum pname, GLint param );
-extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum pname, GLfloat param );
+extern void (APIENTRYP qglPNTrianglesiATI)(GLenum pname, GLint param);
+extern void (APIENTRYP qglPNTrianglesfATI)(GLenum pname, GLfloat param);
//----(SA) end
// for NV fog distance
@@ -460,7 +460,6 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define qglVertexPointer glVertexPointer
#define qglViewport glViewport
-
// GL function loader, based on
https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
// OpenGL 1.2, was GL_EXT_draw_range_elements
@@ -570,6 +569,7 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define GL_HALF_FLOAT_ARB 0x140B
#endif
+// GL_EXT_framebuffer_object
#define QGL_EXT_framebuffer_object_PROCS \
GLE(void, BindRenderbufferEXT, GLenum target, GLuint renderbuffer) \
GLE(void, DeleteRenderbuffersEXT, GLsizei n, const GLuint
*renderbuffers) \
@@ -736,4 +736,3 @@ QGL_EXT_direct_state_access_PROCS;
#undef GLE
#endif // __QGL_H__
-
diff --git a/SP/code/renderer/qgl.h b/SP/code/renderer/qgl.h
index 93da1bc..113689b 100644
--- a/SP/code/renderer/qgl.h
+++ b/SP/code/renderer/qgl.h
@@ -52,12 +52,12 @@ If you have questions concerning this license or the
applicable additional terms
#endif
#endif
-extern void ( APIENTRY * qglActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglClientActiveTextureARB )( GLenum texture );
-extern void ( APIENTRY * qglMultiTexCoord2fARB )( GLenum texture, GLfloat s,
GLfloat t );
+extern void (APIENTRYP qglActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglClientActiveTextureARB) (GLenum texture);
+extern void (APIENTRYP qglMultiTexCoord2fARB) (GLenum target, GLfloat s,
GLfloat t);
-extern void ( APIENTRY * qglLockArraysEXT )( GLint, GLint );
-extern void ( APIENTRY * qglUnlockArraysEXT )( void );
+extern void (APIENTRYP qglLockArraysEXT) (GLint first, GLsizei count);
+extern void (APIENTRYP qglUnlockArraysEXT) (void);
#ifdef USE_OPENGLES
#define GLdouble GLfloat
@@ -113,13 +113,13 @@ extern void myglMultiTexCoord2f( GLenum texture, GLfloat
s, GLfloat t );
#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7
#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8
#endif
-typedef void ( APIENTRY * PFNGLPNTRIANGLESIATIPROC )( GLenum pname, GLint
param );
-typedef void ( APIENTRY * PFNGLPNTRIANGLESFATIPROC )( GLenum pname, GLfloat
param );
+typedef void (APIENTRYP PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param);
+typedef void (APIENTRYP PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param);
#endif
//----(SA) added
-extern void ( APIENTRY * qglPNTrianglesiATI )( GLenum pname, GLint param );
-extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum pname, GLfloat param );
+extern void (APIENTRYP qglPNTrianglesiATI)(GLenum pname, GLint param);
+extern void (APIENTRYP qglPNTrianglesfATI)(GLenum pname, GLfloat param);
//----(SA) end
// for NV fog distance
@@ -519,7 +519,6 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define qglVertexPointer glVertexPointer
#define qglViewport glViewport
-
// GL function loader, based on
https://gist.github.com/rygorous/16796a0c876cf8a5f542caddb55bce8a
// OpenGL 1.2, was GL_EXT_draw_range_elements
@@ -629,6 +628,7 @@ extern void ( APIENTRY * qglPNTrianglesfATI )( GLenum
pname, GLfloat param );
#define GL_HALF_FLOAT_ARB 0x140B
#endif
+// GL_EXT_framebuffer_object
#define QGL_EXT_framebuffer_object_PROCS \
GLE(void, BindRenderbufferEXT, GLenum target, GLuint renderbuffer) \
GLE(void, DeleteRenderbuffersEXT, GLsizei n, const GLuint
*renderbuffers) \
@@ -795,4 +795,3 @@ QGL_EXT_direct_state_access_PROCS;
#undef GLE
#endif // __QGL_H__
-
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/iortcw.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
