glsl: fix memory leak

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

diff --git a/src/mesa/tnl/t_context.h b/src/mesa/tnl/t_context.h
index a872f261775f88c255e89e5773a35413d159f16f..c19eb3df3cbc799678ffa5df476a8c2a626ef5c7 100644 (file)
--- a/src/mesa/tnl/t_context.h
+++ b/src/mesa/tnl/t_context.h
@@ -49,8 +49,9 @@
 #ifndef _T_CONTEXT_H
 #define _T_CONTEXT_H
 
-#include "glheader.h"
-#include "mtypes.h"
+#include "main/glheader.h"
+#include "main/bitset.h"
+#include "main/mtypes.h"
 
 #include "math/m_matrix.h"
 #include "math/m_vector.h"
@@ -217,7 +218,6 @@ struct vertex_buffer
    GLvector4f  *ColorPtr[2];                   /* _TNL_BIT_COLOR0 */
    GLvector4f  *SecondaryColorPtr[2];           /* _TNL_BIT_COLOR1 */
    GLvector4f  *FogCoordPtr;                   /* _TNL_BIT_FOG */
-   GLvector4f  *VaryingPtr[MAX_VARYING_VECTORS];
 
    const struct _mesa_prim  *Primitive;                      
    GLuint      PrimitiveCount;       
@@ -386,19 +386,6 @@ struct tnl_clipspace
 };
 
 
-struct tnl_cache_item {
-   GLuint hash;
-   void *key;
-   void *data;
-   struct tnl_cache_item *next;
-};
-
-struct tnl_cache {
-   struct tnl_cache_item **items;
-   GLuint size, n_items;
-};
-
-
 struct tnl_device_driver
 {
    /***
@@ -550,10 +537,6 @@ typedef struct
    GLubyte *block[VERT_ATTRIB_MAX];
    GLuint nr_blocks;
 
-   /* Cache of fixed-function-replacing vertex programs:
-    */
-   struct tnl_cache *vp_cache;
-
 } TNLcontext;