Add a 'RenderPrimitive' callback to t_vb_render.c. Helps out drivers

that used to require a 'ReducedPrimitiveChange' callback.

Various compilation fixes for XFree86.

Reverted to the older version of glcore.h used internally in XFree86, and
moved it to 'Mesa/include/GL/internal/glcore.h', for compatibility with
XFree86.

9 files changed, 32 insertions, 31 deletions

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 8624cb62e7..4b951c89f7 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.115 2001/01/05 05:31:42 keithw Exp $ */
+/* $Id: context.c,v 1.116 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -131,7 +131,8 @@ __glCoreCreateContext(__GLimports *imports, __GLcontextModes *modes)
                             modes->accumAlphaBits,
                             0);
 
-    _mesa_initialize_context(ctx, &ctx->Visual, NULL, imports->wscx, GL_FALSE);
+    /* KW: was imports->wscx */
+    _mesa_initialize_context(ctx, &ctx->Visual, NULL, imports->other, GL_FALSE);
 
     ctx->exports.destroyContext = _mesa_DestroyContext;
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 9c600783dc..d3cd4f8a6e 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1,4 +1,4 @@
-/* $Id: dd.h,v 1.45 2001/01/05 02:26:48 keithw Exp $ */
+/* $Id: dd.h,v 1.46 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -746,6 +746,7 @@ struct dd_function_table {
 
 
    void (*RenderStart)( GLcontext *ctx );
+   void (*RenderPrimitive)( GLcontext *ctx, GLenum mode );
    void (*RenderFinish)( GLcontext *ctx );
    /* Wrap around all rendering functions.  Suitable for
     * grabbing/releasing hardware locks.
@@ -895,6 +896,7 @@ struct dd_function_table {
    void (*LogicOpcode)(GLcontext *ctx, GLenum opcode);
    void (*PolygonMode)(GLcontext *ctx, GLenum face, GLenum mode);
    void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask );
+   void (*RenderMode)(GLcontext *ctx, GLenum mode );
    void (*Scissor)(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h);
    void (*ShadeModel)(GLcontext *ctx, GLenum mode);
    void (*StencilFunc)(GLcontext *ctx, GLenum func, GLint ref, GLuint mask);
diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
index e5de63c0ec..3c19e562e5 100644
--- a/src/mesa/main/dispatch.c
+++ b/src/mesa/main/dispatch.c
@@ -1,4 +1,4 @@
-/* $Id: dispatch.c,v 1.18 2001/01/02 10:07:34 joukj Exp $ */
+/* $Id: dispatch.c,v 1.19 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -98,8 +98,6 @@ trace(void)
 
 #else
 
-#ifdef THREADS
-
 #define DISPATCH(FUNC, ARGS, MESSAGE)					\
    const struct _glapi_table *dispatch;					\
    dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
@@ -110,19 +108,6 @@ trace(void)
    dispatch = _glapi_Dispatch ? _glapi_Dispatch : _glapi_get_dispatch();\
    return (dispatch->FUNC) ARGS
 
-#else
-
-
-#define DISPATCH(FUNC, ARGS, MESSAGE) \
-__asm__  ("jmp    *(%%eax) ;" : : "a" (&(_glapi_Dispatch->FUNC)) )
-
-#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE)				\
-   const struct _glapi_table *dispatch;					\
-   dispatch = _glapi_Dispatch;\
-   return (dispatch->FUNC) ARGS
-
-#endif
-
 #endif
 
 
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 4a1ebe0b97..4d6941a576 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -1,4 +1,4 @@
-/* $Id: feedback.c,v 1.18 2000/12/26 05:09:28 keithw Exp $ */
+/* $Id: feedback.c,v 1.19 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -406,6 +406,9 @@ _mesa_RenderMode( GLenum mode )
    }
 
    ctx->RenderMode = mode;
+   if (ctx->Driver.RenderMode) 
+      ctx->Driver.RenderMode( ctx, mode );
+
    return result;
 }
 
diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index f98e9885bb..bd8f39dba2 100644
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -1,4 +1,4 @@
-/* $Id: glheader.h,v 1.15 2000/09/26 20:53:53 brianp Exp $ */
+/* $Id: glheader.h,v 1.16 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -177,7 +177,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 #ifndef CAPI
 #define CAPI
 #endif
-#include "glcore.h"
+#include <GL/internal/glcore.h>
 
 
 
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index bb3c49376c..93fb906f35 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -1,4 +1,4 @@
-/* $Id: imports.c,v 1.3 2000/11/22 07:32:17 joukj Exp $ */
+/* $Id: imports.c,v 1.4 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -76,6 +76,11 @@ _mesa_warning(__GLcontext *gc, char *str)
 #ifdef DEBUG
    debug = GL_TRUE;
 #else
+/* Whacko XFree86 macro:
+ */
+#ifdef getenv
+#undef getenv			
+#endif
    if (gc->imports.getenv(gc, "MESA_DEBUG")) {
       debug = GL_TRUE;
    }
@@ -99,7 +104,7 @@ static char *
 _mesa_getenv(__GLcontext *gc, const char *var)
 {
    (void) gc;
-   return getenv(var);
+   return gc->imports.getenv(gc, var);
 }
 
 static int
@@ -153,12 +158,12 @@ _mesa_InitDefaultImports(__GLimports *imports, void *driverCtx, void *other)
    imports->warning = _mesa_warning;
    imports->fatal = _mesa_fatal;
    imports->getenv = _mesa_getenv;
-   imports->atoi = _mesa_atoi;
+/*     imports->atoi = _mesa_atoi; */
    imports->sprintf = _mesa_sprintf;
    imports->fopen = _mesa_fopen;
    imports->fclose = _mesa_fclose;
    imports->fprintf = _mesa_fprintf;
    imports->getDrawablePrivate = _mesa_GetDrawablePrivate;
-   imports->wscx = driverCtx;
-   imports->other = other;
+/*     imports->wscx = driverCtx; */
+   imports->other = driverCtx;
 }
diff --git a/src/mesa/main/lines.c b/src/mesa/main/lines.c
index c54f108b23..730e3f572f 100644
--- a/src/mesa/main/lines.c
+++ b/src/mesa/main/lines.c
@@ -1,4 +1,4 @@
-/* $Id: lines.c,v 1.24 2000/12/26 05:09:29 keithw Exp $ */
+/* $Id: lines.c,v 1.25 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -57,6 +57,10 @@ _mesa_LineWidth( GLfloat width )
 
    FLUSH_VERTICES(ctx, _NEW_LINE);
    ctx->Line.Width = width;
+   ctx->Line._Width = CLAMP(width, 
+			    ctx->Const.MinLineWidth,
+			    ctx->Const.MaxLineWidth);
+
 
    if (width != 1.0) 
       ctx->_TriangleCaps |= DD_LINE_WIDTH;
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index a77e2fc65b..a8694a96c3 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -1,4 +1,4 @@
-/* $Id: macros.h,v 1.16 2000/12/26 05:09:29 keithw Exp $ */
+/* $Id: macros.h,v 1.17 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -73,7 +73,7 @@
 #define STRIDE_F(p, i)  (p = (GLfloat *)((GLubyte *)p + i))
 #define STRIDE_UI(p, i)  (p = (GLuint *)((GLubyte *)p + i))
 #define STRIDE_4UB(p, i)  (p = (GLubyte (*)[4])((GLubyte *)p + i))
-#define STRIDE_T(p, t, i)  (p = (t *)((GLubyte *)p + i))
+#define STRIDE_T(p, t, i)  (p = (t)((GLubyte *)p + i))
 
 
 #define ZERO_2V( DST )	(DST)[0] = (DST)[1] = 0
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ee46c6d888..4cb966f7d2 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1,4 +1,4 @@
-/* $Id: mtypes.h,v 1.11 2001/01/06 22:46:13 gareth Exp $ */
+/* $Id: mtypes.h,v 1.12 2001/01/08 04:09:41 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -516,6 +516,7 @@ struct gl_line_attrib {
    GLushort StipplePattern;	/* Stipple pattern */
    GLint StippleFactor;		/* Stipple repeat factor */
    GLfloat Width;		/* Line width */
+   GLfloat _Width;		/* Clamped Line width */
 };