Merge remote branch 'origin/nvc0'

[mesa.git] / src / mesa / main / texenvprogram.h

diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index a7aa60cf374016821d6096b935bbcedd2f3720e4..22e30a519439efbb0ebeb1bc61a9531f35fb39da 100644 (file)
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -27,11 +27,9 @@
 #define TEXENVPROGRAM_H
 
 
-#include "mtypes.h"
+struct gl_context;
 
 extern struct gl_fragment_program *
-_mesa_get_fixed_func_fragment_program(GLcontext *ctx);
-
-extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
+_mesa_get_fixed_func_fragment_program(struct gl_context *ctx);
 
 #endif