diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
| commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
| tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/src/mesa/main/teximage.h | |
| parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
| parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
| download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/teximage.h')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/teximage.h b/mesalib/src/mesa/main/teximage.h index 6ee78c461..b59961eaf 100644 --- a/mesalib/src/mesa/main/teximage.h +++ b/mesalib/src/mesa/main/teximage.h @@ -59,7 +59,8 @@ _mesa_new_texture_image( struct gl_context *ctx ); extern void
-_mesa_delete_texture_image( struct gl_context *ctx, struct gl_texture_image *teximage );
+_mesa_delete_texture_image( struct gl_context *ctx,
+ struct gl_texture_image *teximage );
extern void
_mesa_free_texture_image_data( struct gl_context *ctx,
@@ -82,7 +83,8 @@ _mesa_choose_texture_format(struct gl_context *ctx, extern void
-_mesa_clear_texture_image(struct gl_context *ctx, struct gl_texture_image *texImage);
+_mesa_clear_texture_image(struct gl_context *ctx,
+ struct gl_texture_image *texImage);
extern void
@@ -92,7 +94,8 @@ _mesa_set_tex_image(struct gl_texture_object *tObj, extern struct gl_texture_object *
-_mesa_select_tex_object(struct gl_context *ctx, const struct gl_texture_unit *texUnit,
+_mesa_select_tex_object(struct gl_context *ctx,
+ const struct gl_texture_unit *texUnit,
GLenum target);
extern struct gl_texture_object *
@@ -100,7 +103,8 @@ _mesa_get_current_tex_object(struct gl_context *ctx, GLenum target); extern struct gl_texture_image *
-_mesa_select_tex_image(struct gl_context *ctx, const struct gl_texture_object *texObj,
+_mesa_select_tex_image(struct gl_context *ctx,
+ const struct gl_texture_object *texObj,
GLenum target, GLint level);
@@ -271,6 +275,11 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset, GLsizei height, GLsizei depth, GLenum format,
GLsizei imageSize, const GLvoid *data);
+
+extern void GLAPIENTRY
+_mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer);
+
+
/*@}*/
#endif
|