diff options
| author | Marek Olšák <[email protected]> | 2013-01-02 20:40:24 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2013-02-26 01:14:05 +0100 |
| commit | 3857f450a6d88cf4d0c616a4224bbd5b9cc89388 (patch) | |
| tree | fa78b80e2a08c33f58a21312601503a644024f02 /src/gallium/drivers/r600/r600_texture.c | |
| parent | 52c44cee1e6596a8ace104361a470edadbd6a591 (diff) | |
gallium/util: add helper util_max_layer from r600g
Diffstat (limited to 'src/gallium/drivers/r600/r600_texture.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 7f5752d81e6..acea19d7744 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -609,8 +609,8 @@ struct pipe_surface *r600_create_surface_custom(struct pipe_context *pipe, { struct r600_surface *surface = CALLOC_STRUCT(r600_surface); - assert(templ->u.tex.first_layer <= u_max_layer(texture, templ->u.tex.level)); - assert(templ->u.tex.last_layer <= u_max_layer(texture, templ->u.tex.level)); + assert(templ->u.tex.first_layer <= util_max_layer(texture, templ->u.tex.level)); + assert(templ->u.tex.last_layer <= util_max_layer(texture, templ->u.tex.level)); assert(templ->u.tex.first_layer == templ->u.tex.last_layer); if (surface == NULL) return NULL; @@ -821,7 +821,7 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, resource.flags = R600_RESOURCE_FLAG_TRANSFER; /* We must set the correct texture target and dimensions if needed for a 3D transfer. */ - if (box->depth > 1 && u_max_layer(texture, level) > 0) + if (box->depth > 1 && util_max_layer(texture, level) > 0) resource.target = texture->target; else resource.target = PIPE_TEXTURE_2D; |