mesa: add support for memory object creation/import/delete

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

diff --git a/src/mesa/main/texenvprogram.h b/src/mesa/main/texenvprogram.h
index bca05d00e05098aa2702513dbe532d4ca9e6abab..11439f13b35b1d79ad041590b657860e4fd6c019 100644 (file)
--- a/src/mesa/main/texenvprogram.h
+++ b/src/mesa/main/texenvprogram.h
@@ -1,13 +1,7 @@
-/**
- * \file texenvprogram.h
- * Texture state management.
- */
-
 /*
  * Mesa 3-D graphics library
- * Version:  5.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"),
@@ -22,9 +16,10 @@
  * 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
- * BRIAN PAUL 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.
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
  */
 
 
@@ -32,8 +27,20 @@
 #define TEXENVPROGRAM_H
 
 
-#include "mtypes.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+struct gl_context;
+
+extern struct gl_shader_program *
+_mesa_get_fixed_func_fragment_program(struct gl_context *ctx);
+
+
+#ifdef __cplusplus
+}
+#endif
 
-extern void _mesa_UpdateTexEnvProgram( GLcontext *ctx );
 
 #endif