Merge branch 'llvm-cliptest-viewport'

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

diff --git a/src/mesa/main/texobj.h b/src/mesa/main/texobj.h
index 655c823753c7930892ece719340acfef7b63c979..821b35caa366f1ad790bd908af85831179e866ee 100644 (file)
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -1,21 +1,24 @@
-/* $Id: texobj.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
+/**
+ * \file texobj.h
+ * Texture object management.
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * 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
@@ -25,61 +28,91 @@
  */
 
 
-
-
-
 #ifndef TEXTOBJ_H
 #define TEXTOBJ_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
-#ifdef VMS
-#define gl_test_texture_object_completeness gl_test_texture_object_complete
-#endif
-
-/*
- * Internal functions
+/**
+ * \name Internal functions
  */
+/*@{*/
 
 extern struct gl_texture_object *
-gl_alloc_texture_object( struct gl_shared_state *shared, GLuint name,
-                         GLuint dimensions );
+_mesa_lookup_texture(struct gl_context *ctx, GLuint id);
 
+extern struct gl_texture_object *
+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );
 
-extern void gl_free_texture_object( struct gl_shared_state *shared,
-                                    struct gl_texture_object *t );
+extern void
+_mesa_initialize_texture_object( struct gl_texture_object *obj,
+                                 GLuint name, GLenum target );
 
+extern void
+_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *obj );
 
-extern void gl_test_texture_object_completeness( const GLcontext *ctx, struct gl_texture_object *t );
+extern void
+_mesa_copy_texture_object( struct gl_texture_object *dest,
+                           const struct gl_texture_object *src );
 
+extern void
+_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *obj);
 
-/*
- * API functions
+extern void
+_mesa_reference_texobj(struct gl_texture_object **ptr,
+                       struct gl_texture_object *tex);
+
+extern void
+_mesa_test_texobj_completeness( const struct gl_context *ctx,
+                                struct gl_texture_object *obj );
+
+extern void
+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
+                   GLboolean invalidate_state);
+
+extern struct gl_texture_object *
+_mesa_get_fallback_texture(struct gl_context *ctx);
+
+extern void
+_mesa_unlock_context_textures( struct gl_context *ctx );
+
+extern void
+_mesa_lock_context_textures( struct gl_context *ctx );
+
+/*@}*/
+
+/**
+ * \name API functions
  */
+/*@{*/
 
-extern void gl_GenTextures( GLcontext *ctx, GLsizei n, GLuint *textures );
+extern void GLAPIENTRY
+_mesa_GenTextures( GLsizei n, GLuint *textures );
 
 
-extern void gl_DeleteTextures( GLcontext *ctx,
-                               GLsizei n, const GLuint *textures);
+extern void GLAPIENTRY
+_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
 
 
-extern void gl_BindTexture( GLcontext *ctx, GLenum target, GLuint texture );
+extern void GLAPIENTRY
+_mesa_BindTexture( GLenum target, GLuint texture );
 
 
-extern void gl_PrioritizeTextures( GLcontext *ctx,
-                                   GLsizei n, const GLuint *textures,
-                                   const GLclampf *priorities );
+extern void GLAPIENTRY
+_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
+                          const GLclampf *priorities );
 
 
-extern GLboolean gl_AreTexturesResident( GLcontext *ctx, GLsizei n,
-                                         const GLuint *textures,
-                                         GLboolean *residences );
+extern GLboolean GLAPIENTRY
+_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
+                           GLboolean *residences );
 
+extern GLboolean GLAPIENTRY
+_mesa_IsTexture( GLuint texture );
 
-extern GLboolean gl_IsTexture( GLcontext *ctx, GLuint texture );
+/*@}*/
 
 
 #endif