diff options
| author | Marek Olšák <[email protected]> | 2016-02-24 01:13:22 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-03-09 15:02:26 +0100 |
| commit | bd1feb28273e8d7047304e5a2a02ca3d71de5533 (patch) | |
| tree | 239edaef5de58be8d7210478f1269ffd16e2607e /src/gallium/drivers | |
| parent | 6011d7cf2528a02f1737b25bc180c2076a076173 (diff) | |
gallium/radeon: rename winsys buffer_get/set_tiling to buffer_get/set_metadata
Reviewed-by: Michel Dänzer <[email protected]>
Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/radeon_winsys.h | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 3db7f372c68..57456c6d867 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -1064,7 +1064,7 @@ r300_texture_create_object(struct r300_screen *rscreen, tiling.microtile = tex->tex.microtile; tiling.macrotile = tex->tex.macrotile[0]; tiling.stride = tex->tex.stride_in_bytes[0]; - rws->buffer_set_tiling(tex->buf, &tiling); + rws->buffer_set_metadata(tex->buf, &tiling); return tex; @@ -1120,7 +1120,7 @@ struct pipe_resource *r300_texture_from_handle(struct pipe_screen *screen, if (!buffer) return NULL; - rws->buffer_get_tiling(buffer, &tiling); + rws->buffer_get_metadata(buffer, &tiling); /* Enforce a microtiled zbuffer. */ if (util_format_is_depth_or_stencil(base->format) && diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index b9f5c61a3c3..4f187881334 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -253,7 +253,7 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen, metadata.stride = surface->level[0].pitch_bytes; metadata.scanout = (surface->flags & RADEON_SURF_SCANOUT) != 0; - rscreen->ws->buffer_set_tiling(resource->buf, &metadata); + rscreen->ws->buffer_set_metadata(resource->buf, &metadata); return rscreen->ws->buffer_get_handle(resource->buf, surface->level[0].pitch_bytes, whandle); @@ -901,7 +901,7 @@ static struct pipe_resource *r600_texture_from_handle(struct pipe_screen *screen if (!buf) return NULL; - rscreen->ws->buffer_get_tiling(buf, &metadata); + rscreen->ws->buffer_get_metadata(buf, &metadata); surface.bankw = metadata.bankw; surface.bankh = metadata.bankh; diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h index a885df98d5c..566322c60ab 100644 --- a/src/gallium/drivers/radeon/radeon_winsys.h +++ b/src/gallium/drivers/radeon/radeon_winsys.h @@ -475,8 +475,8 @@ struct radeon_winsys { * \param buf A winsys buffer object to get the flags from. * \param md Metadata */ - void (*buffer_get_tiling)(struct pb_buffer *buf, - struct radeon_bo_metadata *md); + void (*buffer_get_metadata)(struct pb_buffer *buf, + struct radeon_bo_metadata *md); /** * Set buffer metadata. @@ -485,8 +485,8 @@ struct radeon_winsys { * \param buf A winsys buffer object to set the flags for. * \param md Metadata */ - void (*buffer_set_tiling)(struct pb_buffer *buf, - struct radeon_bo_metadata *md); + void (*buffer_set_metadata)(struct pb_buffer *buf, + struct radeon_bo_metadata *md); /** * Get a winsys buffer from a winsys handle. The internal structure |