Merged dispatch-0-0-1dispatch-0-0-1-20000129-merge

1 files changed, 21 insertions, 19 deletions

diff --git a/xc/extras/Mesa/src/pipeline.c b/xc/extras/Mesa/src/pipeline.c
index 3d0d5ef1e..373682a65 100644
--- a/xc/extras/Mesa/src/pipeline.c
+++ b/xc/extras/Mesa/src/pipeline.c
@@ -1,10 +1,10 @@
-/* $Id: pipeline.c,v 1.3 1999/12/14 02:39:38 daryll Exp $ */
+/* $Id: pipeline.c,v 1.4 2000/01/30 00:27:02 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,28 +28,31 @@
  * Copyright (C) 1999 Keith Whitwell.
  */
 
-#ifndef XFree86Server
-#include <stdio.h>
+#ifdef PC_HEADER
+#include "all.h"
 #else
-#include "GL/xf86glx.h"
-#endif
+#include "glheader.h"
 #include "bbox.h"
 #include "clip.h"
 #include "context.h"
 #include "cva.h"
-#include "pipeline.h"
-#include "vbcull.h"
-#include "vbindirect.h"
-#include "vbrender.h"
-#include "vbxform.h"
 #include "fog.h"
 #include "light.h"
+#include "mem.h"
 #include "mmath.h"
+#include "pipeline.h"
 #include "shade.h"
 #include "stages.h"
 #include "types.h"
 #include "translate.h"
+#include "vbcull.h"
+#include "vbindirect.h"
+#include "vbrender.h"
+#include "vbxform.h"
 #include "xform.h"
+#endif
+
+
 
 #ifndef MESA_VERBOSE
 int MESA_VERBOSE = 0 
@@ -58,11 +61,10 @@ int MESA_VERBOSE = 0
 /*                 | VERBOSE_VARRAY */
 /*                 | VERBOSE_TEXTURE */
 /*                 | VERBOSE_API */
-/*                 | VERBOSE_DRIVER */
+               | VERBOSE_DRIVER
 /*                 | VERBOSE_STATE */
 /*                 | VERBOSE_CULL */
 /*                 | VERBOSE_DISPLAY_LIST */
-/*                 | VERBOSE_LIGHTING */
 ;
 #endif
 
@@ -206,7 +208,7 @@ void gl_pipeline_init( GLcontext *ctx )
 /* Called prior to every recomputation of the CVA precalc data, except where
  * the driver is able to calculate the pipeline unassisted.
  */
-void gl_build_full_precalc_pipeline( GLcontext *ctx )
+static void build_full_precalc_pipeline( GLcontext *ctx )
 {
    struct gl_pipeline_stage *pipeline = ctx->PipelineStage;
    struct gl_cva *cva = &ctx->CVA;
@@ -317,7 +319,7 @@ void gl_build_precalc_pipeline( GLcontext *ctx )
 
    if (!ctx->Driver.BuildPrecalcPipeline ||
        !ctx->Driver.BuildPrecalcPipeline( ctx ))
-      gl_build_full_precalc_pipeline( ctx );
+      build_full_precalc_pipeline( ctx );
 
    pre->data_valid = 0;
    pre->pipeline_valid = 1;
@@ -330,7 +332,7 @@ void gl_build_precalc_pipeline( GLcontext *ctx )
 }
 
 
-static void gl_build_full_immediate_pipeline( GLcontext *ctx )
+static void build_full_immediate_pipeline( GLcontext *ctx )
 {
    struct gl_pipeline_stage *pipeline = ctx->PipelineStage;
    struct gl_cva *cva = &ctx->CVA;
@@ -402,7 +404,7 @@ void gl_build_immediate_pipeline( GLcontext *ctx )
 
    if (!ctx->Driver.BuildEltPipeline ||
        !ctx->Driver.BuildEltPipeline( ctx )) {
-      gl_build_full_immediate_pipeline( ctx );
+      build_full_immediate_pipeline( ctx );
    }
 
    elt->pipeline_valid = 1;
@@ -480,7 +482,7 @@ void gl_run_pipeline( struct vertex_buffer *VB )
 {
    struct gl_pipeline *pipe = VB->pipeline;
    struct gl_pipeline_stage **stages = pipe->stages;
-   short x;
+   unsigned short x;
 
    pipe->data_valid = 1;	/* optimized stages might want to reset this. */