diff options
| author | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-10-06 08:50:17 +0200 |
| commit | 543c5ecf97b067fe5e0824f996c227e30ee693b0 (patch) | |
| tree | 7207e6216bd20423b473153e10d1975ca17700fd /mesalib/src/mesa/state_tracker/st_texture.h | |
| parent | a411d3abb8352c0f65fd4f045d825c0b023dadf4 (diff) | |
| parent | b520df571e0a319eae5231d09f36b98f28b8914a (diff) | |
| download | vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.gz vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.tar.bz2 vcxsrv-543c5ecf97b067fe5e0824f996c227e30ee693b0.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_texture.h')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_texture.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_texture.h b/mesalib/src/mesa/state_tracker/st_texture.h index dd3bc7310..3d2a6369c 100644 --- a/mesalib/src/mesa/state_tracker/st_texture.h +++ b/mesalib/src/mesa/state_tracker/st_texture.h @@ -45,8 +45,13 @@ struct st_texture_image { struct gl_texture_image base; + /** Used to store texture data that doesn't fit in the patent + * object's mipmap buffer. + */ + GLubyte *TexData; + /* If stImage->pt != NULL, image data is stored here. - * Else if stImage->base.Data != NULL, image is stored there. + * Else if stImage->TexData != NULL, image is stored there. * Else there is no image data. */ struct pipe_resource *pt; |