diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-09 16:49:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-09 16:49:03 +0200 |
| commit | 05cf7dd22994a1dbfd3580b00690c01c392a5797 (patch) | |
| tree | ec1c29b5f8a67c54b13b44f1eb7aa700f91fef9e /mesalib/src/mesa/drivers/common/meta.h | |
| parent | 0947b921a3223c14322f10d83e71618d1724b734 (diff) | |
| parent | f9cf11136d65f20aab4fb6d5fc3ec3c59185a0b4 (diff) | |
| download | vcxsrv-05cf7dd22994a1dbfd3580b00690c01c392a5797.tar.gz vcxsrv-05cf7dd22994a1dbfd3580b00690c01c392a5797.tar.bz2 vcxsrv-05cf7dd22994a1dbfd3580b00690c01c392a5797.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/include/GL/internal/dri_interface.h
mesalib/scons/gallium.py
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/ir_variable.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/mesa/SConscript
mesalib/src/mesa/drivers/common/driverfuncs.c
mesalib/src/mesa/main/compiler.h
mesalib/src/mesa/main/formats.c
mesalib/src/mesa/main/formats.h
mesalib/src/mesa/main/texcompress.c
mesalib/src/mesa/main/texgetimage.c
mesalib/src/mesa/sources.mak
Diffstat (limited to 'mesalib/src/mesa/drivers/common/meta.h')
| -rw-r--r-- | mesalib/src/mesa/drivers/common/meta.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h index 9a92613c4..9d634ae56 100644 --- a/mesalib/src/mesa/drivers/common/meta.h +++ b/mesalib/src/mesa/drivers/common/meta.h @@ -121,4 +121,11 @@ _mesa_meta_CopyTexSubImage3D(struct gl_context *ctx, GLenum target, GLint level, GLint x, GLint y, GLsizei width, GLsizei height); +extern void +_mesa_meta_GetTexImage(struct gl_context *ctx, GLenum target, GLint level, + GLenum format, GLenum type, GLvoid *pixels, + struct gl_texture_object *texObj, + struct gl_texture_image *texImage); + + #endif /* META_H */ |