DRI SDK headers from mesa 7.3.0.

5 files changed, 24 insertions, 26 deletions

diff --git a/mesa/tnl/t_context.h b/mesa/tnl/t_context.h
index 1ac508f..0a6ce04 100644
--- a/mesa/tnl/t_context.h
+++ b/mesa/tnl/t_context.h
@@ -385,19 +385,6 @@ struct tnl_clipspace
 };
 
 
-struct tnl_cache_item {
-   GLuint hash;
-   void *key;
-   struct gl_vertex_program *prog;
-   struct tnl_cache_item *next;
-};
-
-struct tnl_cache {
-   struct tnl_cache_item **items;
-   GLuint size, n_items;
-};
-
-
 struct tnl_device_driver
 {
    /***
@@ -549,10 +536,6 @@ typedef struct
    GLubyte *block[VERT_ATTRIB_MAX];
    GLuint nr_blocks;
 
-   /* Cache of fixed-function-replacing vertex programs:
-    */
-   struct tnl_cache *vp_cache;
-
 } TNLcontext;
 
 
diff --git a/mesa/tnl/t_pipeline.h b/mesa/tnl/t_pipeline.h
index 0952854..d110010 100644
--- a/mesa/tnl/t_pipeline.h
+++ b/mesa/tnl/t_pipeline.h
@@ -30,7 +30,7 @@
 #ifndef _T_PIPELINE_H_
 #define _T_PIPELINE_H_
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "t_context.h"
 
 extern void _tnl_run_pipeline( GLcontext *ctx );
diff --git a/mesa/tnl/t_vertex.h b/mesa/tnl/t_vertex.h
index fda8f15..2dfd7b5 100644
--- a/mesa/tnl/t_vertex.h
+++ b/mesa/tnl/t_vertex.h
@@ -28,7 +28,7 @@
 #ifndef _TNL_VERTEX_H
 #define _TNL_VERTEX_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 #include "t_context.h"
 
 /* New mechanism to specify hardware vertices so that tnl can build
@@ -119,6 +119,18 @@ extern void *_tnl_emit_vertices_to_buffer( GLcontext *ctx,
 					   GLuint end,
 					   void *dest );
 
+/* This function isn't optimal. Check out 
+ * gallium/auxilary/translate for a more comprehensive implementation of
+ * the same functionality.
+ */
+  
+extern void *_tnl_emit_indexed_vertices_to_buffer( GLcontext *ctx,
+						   const GLuint *elts,
+						   GLuint start,
+						   GLuint end,
+						   void *dest );
+
+
 extern void _tnl_build_vertices( GLcontext *ctx,
 				 GLuint start,
 				 GLuint end,
diff --git a/mesa/tnl/t_vp_build.h b/mesa/tnl/t_vp_build.h
index 4a98fff..d1c147f 100644
--- a/mesa/tnl/t_vp_build.h
+++ b/mesa/tnl/t_vp_build.h
@@ -17,20 +17,19 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * TUNGSTEN GRAPHICS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * TUNGSTEN GRAPHICS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
-#ifndef _T_ARB_BUILD_H
-#define _T_ARB_BUILD_H
+#ifndef T_VP_BUILD_H
+#define T_VP_BUILD_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
-extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
 
-extern void _tnl_ProgramCacheInit( GLcontext *ctx );
-extern void _tnl_ProgramCacheDestroy( GLcontext *ctx );
+extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
 
 #endif
diff --git a/mesa/tnl/tnl.h b/mesa/tnl/tnl.h
index c2b1f71..9a1717b 100644
--- a/mesa/tnl/tnl.h
+++ b/mesa/tnl/tnl.h
@@ -81,4 +81,8 @@ _tnl_draw_prims( GLcontext *ctx,
 		 GLuint min_index,
 		 GLuint max_index);
 
+
+extern void
+_tnl_RasterPos(GLcontext *ctx, const GLfloat vObj[4]);
+
 #endif