radeon: fixup some issue with fbos and sw fallbacks

[mesa.git] / src / mesa / drivers / dri / radeon / radeon_swtcl.h

diff --git a/src/mesa/drivers/dri/radeon/radeon_swtcl.h b/src/mesa/drivers/dri/radeon/radeon_swtcl.h
index c45e711c0b18970311d9e22561063876cda0af0b..3ada9890b37b74cf8aaa0f649b7e8edd1142e12e 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_swtcl.h
+++ b/src/mesa/drivers/dri/radeon/radeon_swtcl.h
@@ -1,4 +1,3 @@
-/* $XFree86$ */
 /**************************************************************************
 
 Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and
@@ -36,14 +35,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __RADEON_TRIS_H__
 #define __RADEON_TRIS_H__
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "swrast/swrast.h"
 #include "radeon_context.h"
 
 extern void radeonInitSwtcl( GLcontext *ctx );
 extern void radeonDestroySwtcl( GLcontext *ctx );
 
-extern void radeonFlushVertices( GLcontext *ctx, GLuint flags );
 extern void radeonChooseRenderState( GLcontext *ctx );
 extern void radeonChooseVertexState( GLcontext *ctx );
 
@@ -55,10 +53,6 @@ extern void radeonBuildVertices( GLcontext *ctx, GLuint start, GLuint count,
 extern void radeonPrintSetupFlags(char *msg, GLuint flags );
 
 
-extern void radeon_emit_contiguous_verts( GLcontext *ctx,
-                                         GLuint start,
-                                         GLuint count );
-
 extern void radeon_emit_indexed_verts( GLcontext *ctx,
                                       GLuint start,
                                       GLuint count );
@@ -69,9 +63,5 @@ extern void radeon_translate_vertex( GLcontext *ctx,
 
 extern void radeon_print_vertex( GLcontext *ctx, const radeonVertex *v );
 
-extern void radeon_import_float_colors( GLcontext *ctx );
-extern void radeon_import_float_spec_colors( GLcontext *ctx );
-
-
-
+extern void r100_swtcl_flush(GLcontext *ctx, uint32_t current_offset);
 #endif