Merged mga branch with trunkmga-0-0-2-20000404-merge

6 files changed, 10 insertions, 4 deletions

diff --git a/xc/extras/Mesa/src/dlist.c b/xc/extras/Mesa/src/dlist.c
index cdb1a5ac3..b2cc13787 100644
--- a/xc/extras/Mesa/src/dlist.c
+++ b/xc/extras/Mesa/src/dlist.c
@@ -4808,6 +4808,7 @@ static void print_list( GLcontext *ctx, FILE *f, GLuint list )
 	 case OPCODE_END_OF_LIST:
             fprintf(f,"END-LIST %u\n", list);
 	    done = GL_TRUE;
+	    gl_print_cassette( (struct immediate *) n[1].data );
 	    break;
          default:
             if (opcode < 0 || opcode > OPCODE_END_OF_LIST) {
diff --git a/xc/extras/Mesa/src/fog.c b/xc/extras/Mesa/src/fog.c
index bac41cb1d..e35906c8f 100644
--- a/xc/extras/Mesa/src/fog.c
+++ b/xc/extras/Mesa/src/fog.c
@@ -35,6 +35,7 @@
 #include "types.h"
 #include "xform.h"
 #endif
+#include "xform.h"
 
 
 
diff --git a/xc/extras/Mesa/src/fog.h b/xc/extras/Mesa/src/fog.h
index 9a58f54a1..59d84517b 100644
--- a/xc/extras/Mesa/src/fog.h
+++ b/xc/extras/Mesa/src/fog.h
@@ -65,4 +65,6 @@ extern void
 _mesa_init_fog( void );
 
 
+extern struct gl_pipeline_stage gl_fog_coord_stage;
+
 #endif
diff --git a/xc/extras/Mesa/src/mmath.h b/xc/extras/Mesa/src/mmath.h
index 6048eb186..30a300cdb 100644
--- a/xc/extras/Mesa/src/mmath.h
+++ b/xc/extras/Mesa/src/mmath.h
@@ -22,7 +22,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-
+/* $XFree86: xc/extras/Mesa/src/mmath.h,v 1.4 2000/03/03 18:30:08 tsi Exp $ */
 
 /*
  * Faster arithmetic functions.  If the FAST_MATH preprocessor symbol is
@@ -47,7 +47,10 @@
  * In the worst case, we force the compiler to use a memory access to
  * truncate the float, by specifying the 'volatile' keyword.
  */
-#if defined(__linux__) && defined(__i386__) 
+#if defined(__linux__) && defined(__i386__) && !defined(IN_MODULE)
+/*
+ * A libc interface is needed for this...
+ */
 #include <fpu_control.h>
 
 #if !defined(_FPU_SETCW)
diff --git a/xc/extras/Mesa/src/types.h b/xc/extras/Mesa/src/types.h
index dc1b5e103..e96740e78 100644
--- a/xc/extras/Mesa/src/types.h
+++ b/xc/extras/Mesa/src/types.h
@@ -1345,8 +1345,6 @@ struct gl_extensions {
 #define DD_STENCIL                  0x1000000 
 #define DD_CLIP_FOG_COORD           0x2000000
 
-
-
 #define DD_SW_SETUP           (DD_TRI_CULL|		\
                                DD_TRI_CULL_FRONT_BACK|	\
                                DD_TRI_OFFSET|		\
diff --git a/xc/extras/Mesa/src/varray.c b/xc/extras/Mesa/src/varray.c
index dc758594a..786793da7 100644
--- a/xc/extras/Mesa/src/varray.c
+++ b/xc/extras/Mesa/src/varray.c
@@ -682,6 +682,7 @@ _mesa_DrawArrays(GLenum mode, GLint start, GLsizei count)
 	 VB->Primitive[VB->CopyStart] = mode;
 	 ctx->Array.Flag[count] |= VERT_END_VB;
 
+	 ctx->Array.Flag[count] |= VERT_END_VB;
          /* Transform and render.
 	  */
          gl_run_pipeline( VB );