remove ^M chars, disable shading language extensions

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

diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index ff46187809deee10e79ab93966c38702b005c6d3..d00bf70a0d10d890eb348ed40d3e3565af7d8ab6 100644 (file)
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -1,4 +1,7 @@
-/* $Id: texobj.h,v 1.9 2003/04/01 16:41:55 brianp Exp $ */
+/**
+ * \file texobj.h
+ * Texture object management.
+ */
 
 /*
  * Mesa 3-D graphics library
@@ -32,10 +35,10 @@
 #include "mtypes.h"
 
 
-
-/*
- * Internal functions
+/**
+ * \name Internal functions
  */
+/*@{*/
 
 extern struct gl_texture_object *
 _mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
@@ -47,12 +50,6 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
 extern void
 _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
 
-extern void
-_mesa_save_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
-
-extern void
-_mesa_remove_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
-
 extern void
 _mesa_copy_texture_object( struct gl_texture_object *dest,
                            const struct gl_texture_object *src );
@@ -61,35 +58,38 @@ extern void
 _mesa_test_texobj_completeness( const GLcontext *ctx,
                                 struct gl_texture_object *obj );
 
+/*@}*/
 
-/*
- * API functions
+
+/**
+ * \name API functions
  */
+/*@{*/
 
-extern void
+extern void GLAPIENTRY
 _mesa_GenTextures( GLsizei n, GLuint *textures );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_DeleteTextures( GLsizei n, const GLuint *textures );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_BindTexture( GLenum target, GLuint texture );
 
 
-extern void
+extern void GLAPIENTRY
 _mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
                           const GLclampf *priorities );
 
 
-extern GLboolean
+extern GLboolean GLAPIENTRY
 _mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
                            GLboolean *residences );
 
-
-extern GLboolean
+extern GLboolean GLAPIENTRY
 _mesa_IsTexture( GLuint texture );
 
+/*@}*/
 
 #endif