projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: set version to 7.5
[mesa.git]
/
src
/
mesa
/
main
/
texobj.h
diff --git
a/src/mesa/main/texobj.h
b/src/mesa/main/texobj.h
index c5cce28c37099e463b4f93b447fd3c8dc44e0ac2..2599c0816a9c867a4ae194b9fdf77466e6862c76 100644
(file)
--- a/
src/mesa/main/texobj.h
+++ b/
src/mesa/main/texobj.h
@@
-5,9
+5,9
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
4.1
+ * Version:
6.5
*
*
- * Copyright (C) 1999-200
2
Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-200
6
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"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-40,6
+40,9
@@
*/
/*@{*/
*/
/*@{*/
+extern struct gl_texture_object *
+_mesa_lookup_texture(GLcontext *ctx, GLuint id);
+
extern struct gl_texture_object *
_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
extern struct gl_texture_object *
_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
@@
-50,20
+53,27
@@
_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_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 );
extern void
_mesa_copy_texture_object( struct gl_texture_object *dest,
const struct gl_texture_object *src );
+extern void
+_mesa_reference_texobj(struct gl_texture_object **ptr,
+ struct gl_texture_object *tex);
+
extern void
_mesa_test_texobj_completeness( const GLcontext *ctx,
struct gl_texture_object *obj );
extern void
_mesa_test_texobj_completeness( const GLcontext *ctx,
struct gl_texture_object *obj );
+extern struct gl_texture_object *
+_mesa_get_fallback_texture(GLcontext *ctx);
+
+extern void
+_mesa_unlock_context_textures( GLcontext *ctx );
+
+extern void
+_mesa_lock_context_textures( GLcontext *ctx );
+
/*@}*/
/*@}*/
@@
-98,4
+108,5
@@
_mesa_IsTexture( GLuint texture );
/*@}*/
/*@}*/
+
#endif
#endif