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 f7e8e690c4c7d3ec24330e5db655ad83267984b4..821b35caa366f1ad790bd908af85831179e866ee 100644 (file)
--- a/src/mesa/main/texobj.h
+++ b/src/mesa/main/texobj.h
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  4.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ * 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"),
@@ -41,61 +41,78 @@
 /*@{*/
 
 extern struct gl_texture_object *
-_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
+_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
 _mesa_initialize_texture_object( struct gl_texture_object *obj,
                                  GLuint name, GLenum target );
 
 extern void
-_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *obj );
 
 extern void
-_mesa_save_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+_mesa_copy_texture_object( struct gl_texture_object *dest,
+                           const struct gl_texture_object *src );
 
 extern void
-_mesa_remove_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
+_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *obj);
 
 extern void
-_mesa_copy_texture_object( struct gl_texture_object *dest,
-                           const struct gl_texture_object *src );
+_mesa_reference_texobj(struct gl_texture_object **ptr,
+                       struct gl_texture_object *tex);
 
 extern void
-_mesa_test_texobj_completeness( const GLcontext *ctx,
+_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
+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