projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: remove duplicated code around framebuffer_renderbuffer()
[mesa.git]
/
src
/
mesa
/
main
/
texobj.h
diff --git
a/src/mesa/main/texobj.h
b/src/mesa/main/texobj.h
index 87767638689094e82bc3df9c5f869a9483f01cb8..f10623899fcb09dfe222e4580b4b71e6d6de1363 100644
(file)
--- a/
src/mesa/main/texobj.h
+++ b/
src/mesa/main/texobj.h
@@
-54,12
+54,6
@@
_mesa_lookup_texture(struct gl_context *ctx, GLuint id);
extern struct gl_texture_object *
_mesa_lookup_texture_err(struct gl_context *ctx, GLuint id, const char* func);
extern struct gl_texture_object *
_mesa_lookup_texture_err(struct gl_context *ctx, GLuint id, const char* func);
-extern void
-_mesa_begin_texture_lookups(struct gl_context *ctx);
-
-extern void
-_mesa_end_texture_lookups(struct gl_context *ctx);
-
extern struct gl_texture_object *
_mesa_lookup_texture_locked(struct gl_context *ctx, GLuint id);
extern struct gl_texture_object *
_mesa_lookup_texture_locked(struct gl_context *ctx, GLuint id);
@@
-176,11
+170,6
@@
_mesa_unlock_context_textures( struct gl_context *ctx );
extern void
_mesa_lock_context_textures( struct gl_context *ctx );
extern void
_mesa_lock_context_textures( struct gl_context *ctx );
-extern void
-_mesa_delete_nameless_texture(struct gl_context *ctx,
- struct gl_texture_object *texObj);
-
-
/*@}*/
/**
/*@}*/
/**
@@
-188,9
+177,15
@@
_mesa_delete_nameless_texture(struct gl_context *ctx,
*/
/*@{*/
*/
/*@{*/
+void GLAPIENTRY
+_mesa_GenTextures_no_error(GLsizei n, GLuint *textures);
+
extern void GLAPIENTRY
_mesa_GenTextures(GLsizei n, GLuint *textures);
extern void GLAPIENTRY
_mesa_GenTextures(GLsizei n, GLuint *textures);
+void GLAPIENTRY
+_mesa_CreateTextures_no_error(GLenum target, GLsizei n, GLuint *textures);
+
extern void GLAPIENTRY
_mesa_CreateTextures(GLenum target, GLsizei n, GLuint *textures);
extern void GLAPIENTRY
_mesa_CreateTextures(GLenum target, GLsizei n, GLuint *textures);
@@
-201,6
+196,9
@@
_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
extern void GLAPIENTRY
_mesa_BindTexture( GLenum target, GLuint texture );
extern void GLAPIENTRY
_mesa_BindTexture( GLenum target, GLuint texture );
+void GLAPIENTRY
+_mesa_BindTextureUnit_no_error(GLuint unit, GLuint texture);
+
extern void GLAPIENTRY
_mesa_BindTextureUnit(GLuint unit, GLuint texture);
extern void GLAPIENTRY
_mesa_BindTextureUnit(GLuint unit, GLuint texture);