diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2009-02-18 16:43:02 +0100 |
|---|---|---|
| committer | Michel Dänzer <daenzer@vmware.com> | 2009-02-18 16:43:02 +0100 |
| commit | 3bd7c5ceffc88a052c5e8e114df2f2c7549ddb4a (patch) | |
| tree | bdb352609c3ef21875a2699428e26b8c8c930f73 /src/mesa/state_tracker/st_texture.h | |
| parent | 76d8951fd3adbb91b2f71d461eec0f304619ca0b (diff) | |
| parent | b89aa1d87ad6cebdbb3f2067863c600f50bf0ff1 (diff) | |
Merge branch 'gallium-texture-transfer'
Conflicts:
src/gallium/drivers/softpipe/sp_tile_cache.c
Diffstat (limited to 'src/mesa/state_tracker/st_texture.h')
| -rw-r--r-- | src/mesa/state_tracker/st_texture.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_texture.h b/src/mesa/state_tracker/st_texture.h index 31f66ad52c..840b7e27cc 100644 --- a/src/mesa/state_tracker/st_texture.h +++ b/src/mesa/state_tracker/st_texture.h @@ -50,7 +50,7 @@ struct st_texture_image */ struct pipe_texture *pt; - struct pipe_surface *surface; + struct pipe_transfer *transfer; }; @@ -132,7 +132,9 @@ extern GLubyte * st_texture_image_map(struct st_context *st, struct st_texture_image *stImage, GLuint zoffset, - GLuint flags); + enum pipe_transfer_usage usage, + unsigned x, unsigned y, + unsigned w, unsigned h); extern void st_texture_image_unmap(struct st_context *st, |