Merge commit 'origin/gallium-0.1' into gallium-0.2

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

diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index bca05d00e05098aa2702513dbe532d4ca9e6abab..a7aa60cf374016821d6096b935bbcedd2f3720e4 100644 (file)
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -1,13 +1,8 @@
-/**
- * \file texenvprogram.h
- * Texture state management.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  7.1
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -34,6 +29,9 @@
 
 #include "mtypes.h"
 
+extern struct gl_fragment_program *
+_mesa_get_fixed_func_fragment_program(GLcontext *ctx);
+
 extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
 
 #endif