Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/tnl/t_vp_build.h b/src/mesa/tnl/t_vp_build.h
index 034701d8c46a2f68e2b7a03387690bb9a7b0d110..1d10ff245d96eb01040f933643f95387fccce363 100644 (file)
--- a/src/mesa/tnl/t_vp_build.h
+++ b/src/mesa/tnl/t_vp_build.h
@@ -27,7 +27,7 @@
 #ifndef T_VP_BUILD_H
 #define T_VP_BUILD_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
 #define TNL_FIXED_FUNCTION_STATE_FLAGS (_NEW_PROGRAM |         \
                                        _NEW_LIGHT |            \
@@ -37,12 +37,6 @@
                                        _NEW_FOG |              \
                                        _NEW_POINT)
 
-extern struct gl_vertex_program *
-_mesa_get_fixed_func_vertex_program(GLcontext *ctx);
-
-extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
-
-extern void _tnl_ProgramCacheInit( GLcontext *ctx );
-extern void _tnl_ProgramCacheDestroy( GLcontext *ctx );
+extern void _tnl_UpdateFixedFunctionProgram( struct gl_context *ctx );
 
 #endif