Merge commit 'origin/gallium-master-merge'

[mesa.git] / src / mesa / shader / shader_api.h

diff --git a/src/mesa/shader/shader_api.h b/src/mesa/shader/shader_api.h
index 5521c585b53de1d1583b9ee94de616be610127a0..ec1996ee98d306cdf49203a8c457496bf34181e2 100644 (file)
--- a/src/mesa/shader/shader_api.h
+++ b/src/mesa/shader/shader_api.h
@@ -27,8 +27,8 @@
 #define SHADER_API_H
 
 
-#include "glheader.h"
-#include "mtypes.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
 
 
 /**
@@ -79,6 +79,10 @@ extern struct gl_shader *
 _mesa_lookup_shader(GLcontext *ctx, GLuint name);
 
 
+extern void
+_mesa_update_shader_textures_used(struct gl_program *prog);
+
+
 extern void
 _mesa_use_program(GLcontext *ctx, GLuint program);