diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-19 14:43:22 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-19 17:07:25 -0600 |
| commit | ee7cf9d80ff962e714bc66487f621e03f21e1293 (patch) | |
| tree | af23e8ff598091c461d857de71e3b5592ab3d98a /src/gallium/drivers/llvmpipe/lp_texture.h | |
| parent | 254dd0c23f53d535fb612746885fea8c0d4c21cd (diff) | |
llvmpipe: checkpoint: fixes for render to 3D texture
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_texture.h')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_texture.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_texture.h b/src/gallium/drivers/llvmpipe/lp_texture.h index 134666db6f..dd54e17dc4 100644 --- a/src/gallium/drivers/llvmpipe/lp_texture.h +++ b/src/gallium/drivers/llvmpipe/lp_texture.h @@ -112,8 +112,8 @@ struct llvmpipe_resource */ void *data; - /** per-tile layout info */ - enum lp_texture_layout *layout[PIPE_TEX_FACE_MAX][LP_MAX_TEXTURE_LEVELS]; + /** array [level][face or slice][tile] of layout values) */ + enum lp_texture_layout *layout[LP_MAX_TEXTURE_LEVELS][PIPE_TEX_FACE_MAX]; boolean userBuffer; /** Is this a user-space buffer? */ unsigned timestamp; @@ -167,7 +167,7 @@ llvmpipe_resource_stride(struct pipe_resource *resource, void * llvmpipe_resource_map(struct pipe_resource *resource, - unsigned face, + unsigned face_slice, unsigned level, unsigned zslice, enum lp_texture_usage tex_usage, @@ -175,7 +175,7 @@ llvmpipe_resource_map(struct pipe_resource *resource, void llvmpipe_resource_unmap(struct pipe_resource *resource, - unsigned face, + unsigned face_slice, unsigned level, unsigned zslice); @@ -186,25 +186,25 @@ llvmpipe_resource_data(struct pipe_resource *resource); void * llvmpipe_get_texture_image_address(struct llvmpipe_resource *lpr, - unsigned face, unsigned level, + unsigned face_slice, unsigned level, enum lp_texture_layout layout); void * llvmpipe_get_texture_image(struct llvmpipe_resource *resource, - unsigned face, unsigned level, + unsigned face_slice, unsigned level, enum lp_texture_usage usage, enum lp_texture_layout layout); ubyte * llvmpipe_get_texture_tile_linear(struct llvmpipe_resource *lpr, - unsigned face, unsigned level, + unsigned face_slice, unsigned level, enum lp_texture_usage usage, unsigned x, unsigned y); ubyte * llvmpipe_get_texture_tile(struct llvmpipe_resource *lpr, - unsigned face, unsigned level, + unsigned face_slice, unsigned level, enum lp_texture_usage usage, unsigned x, unsigned y); |