summaryrefslogtreecommitdiff
path: root/xc/lib/GL/mesa/src/drv/i810/i810pipeline.c
diff options
context:
space:
mode:
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/i810/i810pipeline.c')
-rw-r--r--xc/lib/GL/mesa/src/drv/i810/i810pipeline.c16
1 files changed, 5 insertions, 11 deletions
diff --git a/xc/lib/GL/mesa/src/drv/i810/i810pipeline.c b/xc/lib/GL/mesa/src/drv/i810/i810pipeline.c
index 2cd53b42e..06269a818 100644
--- a/xc/lib/GL/mesa/src/drv/i810/i810pipeline.c
+++ b/xc/lib/GL/mesa/src/drv/i810/i810pipeline.c
@@ -1,15 +1,16 @@
/* #include "i810pipeline.h" */
#include <stdio.h>
-#include "xsmesaP.h"
+
+#include "types.h"
+#include "fog.h"
+
#include "i810vb.h"
#include "i810dd.h"
#include "i810lib.h"
#include "i810tris.h"
+#include "i810pipeline.h"
-#include "fog.h"
-
-#if 0
static struct gl_pipeline_stage i810_fast_stage = {
"I810 fast path",
@@ -68,11 +69,6 @@ GLboolean i810DDBuildPrecalcPipeline( GLcontext *ctx )
}
-#endif
-
-
-
-
GLuint i810DDRegisterPipelineStages( struct gl_pipeline_stage *out,
const struct gl_pipeline_stage *in,
@@ -83,7 +79,6 @@ GLuint i810DDRegisterPipelineStages( struct gl_pipeline_stage *out,
for (i = o = 0 ; i < nr ; i++) {
switch (in[i].ops) {
-#if 0
case PIPE_OP_RAST_SETUP_0:
out[o] = in[i];
out[o].cva_state_change = NEW_LIGHTING|NEW_TEXTURING|NEW_RASTER_OPS;
@@ -98,7 +93,6 @@ GLuint i810DDRegisterPipelineStages( struct gl_pipeline_stage *out,
out[o].run = i810DDDoRasterSetup;
o++;
break;
-#endif
/* Completely replace Mesa's fog processing to generate fog
* coordinates instead of messing with colors.