summaryrefslogtreecommitdiff
path: root/src/mesa/main/texenvprogram.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2008-09-20 08:26:11 -0700
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-21 09:46:00 -0700
commit32ef6e75839d6be283e034436e5dd34eabb67958 (patch)
tree7d8ac6e9236a5822d31481936ae0963154efa377 /src/mesa/main/texenvprogram.h
parente019ead5d76fd4e6e7d47d23e0284058391e1e29 (diff)
mesa: move fixed function vertex program builder from tnl to core mesa
Also unify caching of fragment and vertex programs in shader/prog_cache.c` Brought across from gallium-0.2
Diffstat (limited to 'src/mesa/main/texenvprogram.h')
-rw-r--r--src/mesa/main/texenvprogram.h14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index 6f017767c8..a7aa60cf37 100644
--- 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,8 +29,9 @@
#include "mtypes.h"
+extern struct gl_fragment_program *
+_mesa_get_fixed_func_fragment_program(GLcontext *ctx);
+
extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
-extern void _mesa_TexEnvProgramCacheInit( GLcontext *ctx );
-extern void _mesa_TexEnvProgramCacheDestroy( GLcontext *ctx );
#endif