diff options
| author | Ted Jump <[email protected]> | 1999-09-19 02:03:18 +0000 |
|---|---|---|
| committer | Ted Jump <[email protected]> | 1999-09-19 02:03:18 +0000 |
| commit | 725ec81ae80e024df4a5490405dbfbc598533e6e (patch) | |
| tree | ac0115bd0729dea1f6ffde983f85e266b13e851e /src | |
| parent | 1bf9dfaf5dea61e3d33a69b0a549be54ef6d74df (diff) | |
More Win32 build compliance fixups
Diffstat (limited to 'src')
| -rw-r--r-- | src/glu/mesa/glu.c | 15 | ||||
| -rw-r--r-- | src/mesa/main/feedback.c | 7 | ||||
| -rw-r--r-- | src/mesa/main/stencil.c | 3 |
3 files changed, 12 insertions, 13 deletions
diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c index e844633906f..1efc35cfd33 100644 --- a/src/glu/mesa/glu.c +++ b/src/glu/mesa/glu.c @@ -1,4 +1,4 @@ -/* $Id: glu.c,v 1.14 1999/09/17 12:21:53 brianp Exp $ */ +/* $Id: glu.c,v 1.15 1999/09/19 02:03:19 tjump Exp $ */ /* * Mesa 3-D graphics library @@ -23,6 +23,9 @@ /* * $Log: glu.c,v $ + * Revision 1.15 1999/09/19 02:03:19 tjump + * More Win32 build compliance fixups + * * Revision 1.14 1999/09/17 12:21:53 brianp * glGetProcAddressEXT changes to accomodate Win32 and non-Win32 * @@ -381,10 +384,8 @@ const GLubyte* GLAPIENTRY gluGetString( GLenum name ) #ifdef __cplusplus /* for BeOS R4.5 */ void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))(...) -#elif defined(__WIN32__) - gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName) #else - void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))() + void (GLAPIENTRY *gluGetProcAddressEXT(const GLubyte *procName))() #endif { struct proc { @@ -412,11 +413,7 @@ const GLubyte* GLAPIENTRY gluGetString( GLenum name ) for (i = 0; procTable[i].address; i++) { if (strcmp((const char *) procName, procTable[i].name) == 0) -#ifdef __WIN32__ - return (gluProcAddress) procTable[i].address; -#else - return (void (*)()) procTable[i].address; -#endif + return (void (GLAPIENTRY *)()) procTable[i].address; } return NULL; diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c index 433d0391e88..0fb09d07563 100644 --- a/src/mesa/main/feedback.c +++ b/src/mesa/main/feedback.c @@ -1,4 +1,4 @@ -/* $Id: feedback.c,v 1.2 1999/09/18 20:41:23 keithw Exp $ */ +/* $Id: feedback.c,v 1.3 1999/09/19 02:03:19 tjump Exp $ */ /* * Mesa 3-D graphics library @@ -39,6 +39,7 @@ #include "macros.h" #include "mmath.h" #include "types.h" +#include "triangle.h" #ifdef XFree86Server #include "GL/xf86glx.h" #endif @@ -203,7 +204,7 @@ static void gl_do_feedback_vertex( GLcontext *ctx, GLuint v, GLuint pv ) void gl_feedback_triangle( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLuint pv ) { - if (gl_cull_triangle( ctx, v0, v1, v2 )) { + if (gl_cull_triangle( ctx, v0, v1, v2, 0 )) { FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN ); FEEDBACK_TOKEN( ctx, (GLfloat) 3 ); /* three vertices */ @@ -294,7 +295,7 @@ void gl_select_triangle( GLcontext *ctx, { struct vertex_buffer *VB = ctx->VB; - if (gl_cull_triangle( ctx, v0, v1, v2 )) { + if (gl_cull_triangle( ctx, v0, v1, v2, 0 )) { gl_update_hitflag( ctx, VB->Win.data[v0][3] / DEPTH_SCALE ); gl_update_hitflag( ctx, VB->Win.data[v1][3] / DEPTH_SCALE ); gl_update_hitflag( ctx, VB->Win.data[v2][3] / DEPTH_SCALE ); diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index f03303de585..8bcced1fe7b 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -1,4 +1,4 @@ -/* $Id: stencil.c,v 1.2 1999/09/18 20:41:23 keithw Exp $ */ +/* $Id: stencil.c,v 1.3 1999/09/19 02:03:19 tjump Exp $ */ /* * Mesa 3-D graphics library @@ -35,6 +35,7 @@ #include "pb.h" #include "stencil.h" #include "types.h" +#include "enable.h" #ifdef XFree86Server #include "GL/xf86glx.h" #endif |