Merge remote branch 'origin/master' into pipe-video

[mesa.git] / src / mesa / program / prog_cache.h

diff --git a/src/mesa/program/prog_cache.h b/src/mesa/program/prog_cache.h
index bfe8f99d4457df4e3751c4a50262e4e823ea50c1..5d46bfc5cc931a8b239b923d92ac9a13a4f6ad06 100644 (file)
--- a/src/mesa/program/prog_cache.h
+++ b/src/mesa/program/prog_cache.h
@@ -30,8 +30,9 @@
 #define PROG_CACHE_H
 
 
-#include "main/mtypes.h"
+#include "main/glheader.h"
 
+struct gl_context;
 
 /** Opaque type */
 struct gl_program_cache;
@@ -41,18 +42,27 @@ extern struct gl_program_cache *
 _mesa_new_program_cache(void);
 
 extern void
-_mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *pc);
+_mesa_delete_program_cache(struct gl_context *ctx, struct gl_program_cache *pc);
 
+extern void
+_mesa_delete_shader_cache(struct gl_context *ctx,
+                         struct gl_program_cache *cache);
 
 extern struct gl_program *
 _mesa_search_program_cache(struct gl_program_cache *cache,
                            const void *key, GLuint keysize);
 
 extern void
-_mesa_program_cache_insert(GLcontext *ctx,
+_mesa_program_cache_insert(struct gl_context *ctx,
                            struct gl_program_cache *cache,
                            const void *key, GLuint keysize,
                            struct gl_program *program);
 
+void
+_mesa_shader_cache_insert(struct gl_context *ctx,
+                         struct gl_program_cache *cache,
+                         const void *key, GLuint keysize,
+                         struct gl_shader_program *program);
+
 
 #endif /* PROG_CACHE_H */