From 20ebd99a4867b801e605bab086d4489e973cfb3d Mon Sep 17 00:00:00 2001 From: "Zephaniah E. Hull" Date: Mon, 27 Dec 1999 17:57:03 +0000 Subject: [PATCH] s/APIENTRY/GLAPIENTRY/, and some tweaking with uquake.. --- Makefile | 2 +- common/common_quakedef.h | 2 +- common/glquake2.h | 14 +++++++------- qw_client/glquake.h | 18 +++++++++--------- uquake/gl_vidlinux.c | 1 - uquake/glquake.h | 20 ++++++++++---------- uquake/host.c | 4 ++-- 7 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 133ac8a..e7bc99b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -SUBDIRS = qw_client qw_server standalone #standalone isn't done merging yet +SUBDIRS = qw_client qw_server uquake all %: for dir in $(SUBDIRS); do \ diff --git a/common/common_quakedef.h b/common/common_quakedef.h index 65c9e1b..96c1a12 100644 --- a/common/common_quakedef.h +++ b/common/common_quakedef.h @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define QUAKE_GAME // as opposed to utilities -#define PARANOID // speed sapping error checking +//define PARANOID // speed sapping error checking #define VERSION 0.1 diff --git a/common/glquake2.h b/common/glquake2.h index 06ea6f7..68a5085 100644 --- a/common/glquake2.h +++ b/common/glquake2.h @@ -33,15 +33,15 @@ void GL_EndRendering (void); // Function prototypes for the Texture Object Extension routines -typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, +typedef GLboolean (GLAPIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, const GLboolean *); -typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); -typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); -typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); -typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint); -typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, +typedef void (GLAPIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); +typedef void (GLAPIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); +typedef void (GLAPIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); +typedef GLboolean (GLAPIENTRY *ISTEXFUNCPTR)(GLuint); +typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, const GLclampf *); -typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); +typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); extern BINDTEXFUNCPTR bindTexFunc; extern DELTEXFUNCPTR delTexFunc; diff --git a/qw_client/glquake.h b/qw_client/glquake.h index a58a948..d93a08d 100644 --- a/qw_client/glquake.h +++ b/qw_client/glquake.h @@ -35,15 +35,15 @@ void GL_EndRendering (void); // Function prototypes for the Texture Object Extension routines -typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, +typedef GLboolean (GLAPIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, const GLboolean *); -typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); -typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); -typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); -typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint); -typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, +typedef void (GLAPIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); +typedef void (GLAPIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); +typedef void (GLAPIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); +typedef GLboolean (GLAPIENTRY *ISTEXFUNCPTR)(GLuint); +typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, const GLclampf *); -typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); +typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); extern BINDTEXFUNCPTR bindTexFunc; extern DELTEXFUNCPTR delTexFunc; @@ -238,8 +238,8 @@ void GL_Bind (int texnum); #define TEXTURE1_SGIS 0x835F #ifdef _WIN32 -typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); -typedef void (APIENTRY *lpSelTexFUNC) (GLenum); +typedef void (GLAPIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); +typedef void (GLAPIENTRY *lpSelTexFUNC) (GLenum); extern lpMTexFUNC qglMTexCoord2fSGIS; extern lpSelTexFUNC qglSelectTextureSGIS; #endif diff --git a/uquake/gl_vidlinux.c b/uquake/gl_vidlinux.c index f1d1139..76347b0 100644 --- a/uquake/gl_vidlinux.c +++ b/uquake/gl_vidlinux.c @@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "GL/fxmesa.h" -#include #define WARP_WIDTH 320 #define WARP_HEIGHT 200 diff --git a/uquake/glquake.h b/uquake/glquake.h index 256a234..cb9d144 100644 --- a/uquake/glquake.h +++ b/uquake/glquake.h @@ -38,15 +38,15 @@ void GL_EndRendering (void); #ifdef _WIN32 // Function prototypes for the Texture Object Extension routines -typedef GLboolean (APIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, +typedef GLboolean (GLAPIENTRY *ARETEXRESFUNCPTR)(GLsizei, const GLuint *, const GLboolean *); -typedef void (APIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); -typedef void (APIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); -typedef void (APIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); -typedef GLboolean (APIENTRY *ISTEXFUNCPTR)(GLuint); -typedef void (APIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, +typedef void (GLAPIENTRY *BINDTEXFUNCPTR)(GLenum, GLuint); +typedef void (GLAPIENTRY *DELTEXFUNCPTR)(GLsizei, const GLuint *); +typedef void (GLAPIENTRY *GENTEXFUNCPTR)(GLsizei, GLuint *); +typedef GLboolean (GLAPIENTRY *ISTEXFUNCPTR)(GLuint); +typedef void (GLAPIENTRY *PRIORTEXFUNCPTR)(GLsizei, const GLuint *, const GLclampf *); -typedef void (APIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); +typedef void (GLAPIENTRY *TEXSUBIMAGEPTR)(int, int, int, int, int, int, int, int, void *); extern BINDTEXFUNCPTR bindTexFunc; extern DELTEXFUNCPTR delTexFunc; @@ -239,11 +239,11 @@ void GL_Bind (int texnum); #define TEXTURE1_SGIS 0x835F #ifndef _WIN32 -#define APIENTRY /* */ +#define GLAPIENTRY /* */ #endif -typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); -typedef void (APIENTRY *lpSelTexFUNC) (GLenum); +typedef void (GLAPIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat); +typedef void (GLAPIENTRY *lpSelTexFUNC) (GLenum); extern lpMTexFUNC qglMTexCoord2fSGIS; extern lpSelTexFUNC qglSelectTextureSGIS; diff --git a/uquake/host.c b/uquake/host.c index b08c15c..55cd453 100644 --- a/uquake/host.c +++ b/uquake/host.c @@ -893,12 +893,12 @@ void Host_Init (quakeparms_t *parms) #ifndef _WIN32 // on Win32, sound initialization has to come before video initialization, so we // can put up a popup if the sound hardware is in use -// S_Init (); + S_Init (); #else #ifdef GLQUAKE // FIXME: doesn't use the new one-window approach yet -// S_Init (); + S_Init (); #endif #endif // _WIN32