summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/GL/gl.h12
-rw-r--r--include/GL/glu.h13
-rw-r--r--progs/redbook/image.c2
-rw-r--r--progs/samples/overlay.c2
-rw-r--r--src/glu/mesa/glu.c15
-rw-r--r--src/mesa/main/feedback.c7
-rw-r--r--src/mesa/main/stencil.c3
7 files changed, 23 insertions, 31 deletions
diff --git a/include/GL/gl.h b/include/GL/gl.h
index 02b1239389..8c00484d58 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.7 1999/09/18 01:06:52 brianp Exp $ */
+/* $Id: gl.h,v 1.8 1999/09/19 02:03:18 tjump Exp $ */
/*
* Mesa 3-D graphics library
@@ -2181,17 +2181,11 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
* If you want to try it out, #define GL_EXT_get_proc_address before
* #include <GL/gl.h>
*/
+#define GL_EXT_get_proc_address 1
#ifdef GL_EXT_get_proc_address
-#ifdef __WIN32__
- typedef (void GLAPIENTRY *glProcAddress)();
- glProcAddress GLAPIENTRY glGetProcAddressEXT(const GLubyte *procName);
-#else
- /* everything but Windows */
- GLAPI void GLAPIENTRY (*glGetProcAddressEXT(const GLubyte *procName))();
-#endif
+GLAPI void (GLAPIENTRY *glGetProcAddressEXT(const GLubyte *procName))();
#endif
-
#if defined(__BEOS__) || defined(__QUICKDRAW__)
#pragma export off
#endif
diff --git a/include/GL/glu.h b/include/GL/glu.h
index 01d630ef8b..6861a17190 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -1,4 +1,4 @@
-/* $Id: glu.h,v 1.8 1999/09/17 12:21:36 brianp Exp $ */
+/* $Id: glu.h,v 1.9 1999/09/19 02:03:18 tjump Exp $ */
/*
* Mesa 3-D graphics library
@@ -23,6 +23,9 @@
/*
* $Log: glu.h,v $
+ * Revision 1.9 1999/09/19 02:03:18 tjump
+ * More Win32 build compliance fixups
+ *
* Revision 1.8 1999/09/17 12:21:36 brianp
* glGetProcAddressEXT changes to accomodate Win32 and non-Win32
*
@@ -511,15 +514,11 @@ GLUAPI const GLubyte* GLAPIENTRY gluGetString( GLenum name );
* which uses this extension yet! It may change!
*/
#define GLU_EXT_get_proc_address 1
-#ifdef __WIN32__
- typedef (void (GLAPIENTRY *gluProcAddress))();
- gluProcAddress GLAPIENTRY gluGetProcAddressEXT(const GLubyte *procName);
-#else
- GLUAPI void GLAPIENTRY (*gluGetProcAddressEXT(const GLubyte *procName))();
+#ifdef GLU_EXT_get_proc_address
+GLUAPI void (GLAPIENTRY *glGetProcAddressEXT(const GLubyte *procName))();
#endif
-
#if defined(__BEOS__) || defined(__QUICKDRAW__)
#pragma export off
#endif
diff --git a/progs/redbook/image.c b/progs/redbook/image.c
index 8e62f5afd3..dc1a7246eb 100644
--- a/progs/redbook/image.c
+++ b/progs/redbook/image.c
@@ -64,7 +64,7 @@ void makeCheckImage(void)
for (i = 0; i < checkImageHeight; i++) {
for (j = 0; j < checkImageWidth; j++) {
- c = ((((i&0x8)==0)^((j&0x8))==0))*255;
+ c = (((i&0x8)==0)^((j&0x8)==0))*255;
checkImage[i][j][0] = (GLubyte) c;
checkImage[i][j][1] = (GLubyte) c;
checkImage[i][j][2] = (GLubyte) c;
diff --git a/progs/samples/overlay.c b/progs/samples/overlay.c
index 0def2b1105..4542b49a0a 100644
--- a/progs/samples/overlay.c
+++ b/progs/samples/overlay.c
@@ -347,7 +347,7 @@ int main(int argc, char **argv)
if (!glutLayerGet(GLUT_OVERLAY_POSSIBLE))
{
fprintf(stderr, "Overlay not available\n");
- return;
+ return(1);
}
if (Args(argc, argv) == GL_FALSE) {
diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c
index e844633906..1efc35cfd3 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 433d0391e8..0fb09d0756 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 f03303de58..8bcced1fe7 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