summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/Makefile.X115
-rw-r--r--src/mesa/drivers/glide/fxdd.c1
-rw-r--r--src/mesa/drivers/glide/fxdrv.h6
-rw-r--r--src/mesa/main/Makefile.X115
4 files changed, 2 insertions, 15 deletions
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 9ad2b28d4d..fb8d0b2b14 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.25 2000/10/23 19:43:38 brianp Exp $
+# $Id: Makefile.X11,v 1.26 2000/10/31 12:40:57 keithw Exp $
# Mesa 3-D graphics library
# Version: 3.5
@@ -120,7 +120,6 @@ DRIVER_SOURCES = \
SVGA/svgamesa32.c \
FX/fxapi.c \
FX/fxclip.c \
- FX/fxcva.c \
FX/fxdd.c \
FX/fxddspan.c \
FX/fxddtex.c \
@@ -204,8 +203,6 @@ FX/fxapi.o: FX/fxapi.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
FX/fxclip.o: FX/fxclip.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-FX/fxcva.o: FX/fxcva.c
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
FX/fxdd.o: FX/fxdd.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
FX/fxddspan.o: FX/fxddspan.c
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 3811770558..64b2312c8d 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -834,7 +834,6 @@ int fxDDInitFxMesaContext( fxMesaContext fxMesa )
fxMesa->new_state = _NEW_ALL;
fxDDSetupInit();
- fxDDCvaInit();
fxDDClipInit();
fxDDTrifuncInit();
fxDDFastPathInit();
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 412f3cb15d..9a5fd0cd75 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -575,9 +575,6 @@ extern void fxDDChooseRenderState( GLcontext *ctx );
extern void fxRenderClippedLine( struct vertex_buffer *VB,
GLuint v1, GLuint v2 );
-extern void fxRenderClippedTriangle( struct vertex_buffer *VB,
- GLuint n, GLuint vlist[] );
-
extern tfxSetupFunc fxDDChooseSetupFunction(GLcontext *);
@@ -634,8 +631,6 @@ extern void fxDDCheckMergeAndRender( GLcontext *ctx,
extern void fxDDMergeAndRender( struct vertex_buffer *VB );
-extern void fxDDCheckPartialRasterSetup( GLcontext *ctx,
- struct gl_pipeline_stage *d );
extern void fxDDPartialRasterSetup( struct vertex_buffer *VB );
@@ -651,7 +646,6 @@ extern void fxDDOptimizePrecalcPipeline( GLcontext *ctx,
struct gl_pipeline *pipe );
extern void fxDDRenderElementsDirect( struct vertex_buffer *VB );
-extern void fxDDRenderVBIndirectDirect( struct vertex_buffer *VB );
extern void fxDDInitExtensions( GLcontext *ctx );
diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 9ad2b28d4d..fb8d0b2b14 100644
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.25 2000/10/23 19:43:38 brianp Exp $
+# $Id: Makefile.X11,v 1.26 2000/10/31 12:40:57 keithw Exp $
# Mesa 3-D graphics library
# Version: 3.5
@@ -120,7 +120,6 @@ DRIVER_SOURCES = \
SVGA/svgamesa32.c \
FX/fxapi.c \
FX/fxclip.c \
- FX/fxcva.c \
FX/fxdd.c \
FX/fxddspan.c \
FX/fxddtex.c \
@@ -204,8 +203,6 @@ FX/fxapi.o: FX/fxapi.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
FX/fxclip.o: FX/fxclip.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
-FX/fxcva.o: FX/fxcva.c
- $(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
FX/fxdd.o: FX/fxdd.c
$(CC) -c -I. -I$(INCDIR) $(CFLAGS) $< -o $@
FX/fxddspan.o: FX/fxddspan.c