projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: fix some minor texstore comments
[mesa.git]
/
src
/
mesa
/
main
/
texobj.h
diff --git
a/src/mesa/main/texobj.h
b/src/mesa/main/texobj.h
index 2599c0816a9c867a4ae194b9fdf77466e6862c76..9ca7a4c9e11834cdd3fbcff23340d1b145af9e8b 100644
(file)
--- a/
src/mesa/main/texobj.h
+++ b/
src/mesa/main/texobj.h
@@
-32,8
+32,10
@@
#define TEXTOBJ_H
#define TEXTOBJ_H
-#include "mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
+struct gl_context;
/**
* \name Internal functions
/**
* \name Internal functions
@@
-41,42
+43,62
@@
/*@{*/
extern struct gl_texture_object *
/*@{*/
extern struct gl_texture_object *
-_mesa_lookup_texture(
GL
context *ctx, GLuint id);
+_mesa_lookup_texture(
struct gl_
context *ctx, GLuint id);
extern struct gl_texture_object *
extern struct gl_texture_object *
-_mesa_new_texture_object(
GL
context *ctx, GLuint name, GLenum target );
+_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
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_copy_texture_object( struct gl_texture_object *dest,
const struct gl_texture_object *src );
extern void
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);
+
+extern void
+_mesa_reference_texobj_(struct gl_texture_object **ptr,
+ struct gl_texture_object *tex);
+
+static inline void
_mesa_reference_texobj(struct gl_texture_object **ptr,
_mesa_reference_texobj(struct gl_texture_object **ptr,
- struct gl_texture_object *tex);
+ struct gl_texture_object *tex)
+{
+ if (*ptr != tex)
+ _mesa_reference_texobj_(ptr, tex);
+}
+
extern void
extern void
-_mesa_test_texobj_completeness( const
GL
context *ctx,
+_mesa_test_texobj_completeness( const
struct gl_
context *ctx,
struct gl_texture_object *obj );
struct gl_texture_object *obj );
+extern GLboolean
+_mesa_cube_complete(const struct gl_texture_object *texObj);
+
+extern void
+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,
+ GLboolean invalidate_state);
+
extern struct gl_texture_object *
extern struct gl_texture_object *
-_mesa_get_fallback_texture(
GL
context *ctx);
+_mesa_get_fallback_texture(
struct gl_
context *ctx);
extern void
extern void
-_mesa_unlock_context_textures(
GL
context *ctx );
+_mesa_unlock_context_textures(
struct gl_
context *ctx );
extern void
extern void
-_mesa_lock_context_textures(
GL
context *ctx );
+_mesa_lock_context_textures(
struct gl_
context *ctx );
/*@}*/
/*@}*/
-
/**
* \name API functions
*/
/**
* \name API functions
*/