Undo last change - breaks other stuff.

[mesa.git] / src / mesa / tnl / t_imm_exec.h

diff --git a/src/mesa/tnl/t_imm_exec.h b/src/mesa/tnl/t_imm_exec.h
index ab5fa292d71a6bfe99e30a11c064ffb290953962..5e586449e8ac0edc823ceaf35f990b3a342f4756 100644 (file)
--- a/src/mesa/tnl/t_imm_exec.h
+++ b/src/mesa/tnl/t_imm_exec.h
@@ -1,10 +1,10 @@
-/* $Id: t_imm_exec.h,v 1.3 2001/02/15 01:33:52 keithw Exp $ */
+/* $Id: t_imm_exec.h,v 1.7 2001/08/02 22:39:51 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  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"),
@@ -44,7 +44,7 @@ extern void _tnl_flush_immediate( struct immediate *IM );
  */
 extern void _tnl_run_cassette( GLcontext *ctx, struct immediate *IM );
 extern void _tnl_copy_to_current( GLcontext *ctx, struct immediate *IM,
-                                 GLuint flag );
+                                 GLuint flag, GLuint row );
 
 /* Initialize some stuff:
  */
@@ -52,12 +52,17 @@ extern void _tnl_imm_init( GLcontext *ctx );
 
 extern void _tnl_imm_destroy( GLcontext *ctx );
 
-extern void _tnl_reset_input( GLcontext *ctx, 
-                             GLuint start,
-                             GLuint beginstate, 
-                             GLuint savedbeginstate );
+extern void _tnl_reset_exec_input( GLcontext *ctx,
+                                  GLuint start,
+                                  GLuint beginstate,
+                                  GLuint savedbeginstate );
 
-extern void _tnl_compute_orflag( struct immediate *IM );
+extern void _tnl_reset_compile_input( GLcontext *ctx,
+                                     GLuint start,
+                                     GLuint beginstate,
+                                     GLuint savedbeginstate );
+
+extern void _tnl_compute_orflag( struct immediate *IM, GLuint start );
 extern void _tnl_execute_cassette( GLcontext *ctx, struct immediate *IM );