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 4a98fff026d03929f96666c8f76196a5e14228d9..1d10ff245d96eb01040f933643f95387fccce363 100644 (file)
--- a/src/mesa/tnl/t_vp_build.h
+++ b/src/mesa/tnl/t_vp_build.h
@@ -17,20 +17,26 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * TUNGSTEN GRAPHICS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * TUNGSTEN GRAPHICS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
-#ifndef _T_ARB_BUILD_H
-#define _T_ARB_BUILD_H
+#ifndef T_VP_BUILD_H
+#define T_VP_BUILD_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
 
-extern void _tnl_UpdateFixedFunctionProgram( GLcontext *ctx );
+#define TNL_FIXED_FUNCTION_STATE_FLAGS (_NEW_PROGRAM |         \
+                                       _NEW_LIGHT |            \
+                                       _NEW_TEXTURE |          \
+                                       _NEW_TEXTURE_MATRIX |           \
+                                       _NEW_TRANSFORM |        \
+                                       _NEW_FOG |              \
+                                       _NEW_POINT)
 
-extern void _tnl_ProgramCacheInit( GLcontext *ctx );
-extern void _tnl_ProgramCacheDestroy( GLcontext *ctx );
+extern void _tnl_UpdateFixedFunctionProgram( struct gl_context *ctx );
 
 #endif