diff options
| author | Brian Paul <[email protected]> | 2017-12-07 15:00:49 -0700 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2017-12-12 09:44:59 -0700 |
| commit | 63b03dc924adf91ecb5da757edafa975878d7047 (patch) | |
| tree | 72dba06e5c6b01d809a9f6fd50cbdd86b572d9cc /src | |
| parent | dde8309cdea5c739983693650105b2f993c5a71c (diff) | |
gallium/util: don't pass a pipe_resource to util_resource_is_array_texture()
No need to pass a pipe_resource when we can just pass the target.
This makes the function potentially more usable. Rename it too.
Reviewed-by: Roland Scheidegger <[email protected]>
Reviewed-by: Charmaine Lee <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/auxiliary/util/u_resource.h | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_texture.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/util/u_resource.h b/src/gallium/auxiliary/util/u_resource.h index 6736476f4da..3c6194b8f07 100644 --- a/src/gallium/auxiliary/util/u_resource.h +++ b/src/gallium/auxiliary/util/u_resource.h @@ -32,14 +32,14 @@ unsigned util_resource_size(const struct pipe_resource *res); /** - * Return true if the resource is an array texture. + * Return true if the texture target is an array type. * * Note that this function returns true for single-layered array textures. */ static inline boolean -util_resource_is_array_texture(const struct pipe_resource *res) +util_texture_is_array(enum pipe_texture_target target) { - switch (res->target) { + switch (target) { case PIPE_TEXTURE_1D_ARRAY: case PIPE_TEXTURE_2D_ARRAY: case PIPE_TEXTURE_CUBE_ARRAY: diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c index cb69398e6af..66d4f02622f 100644 --- a/src/gallium/drivers/radeon/r600_texture.c +++ b/src/gallium/drivers/radeon/r600_texture.c @@ -582,7 +582,7 @@ static void si_query_opaque_metadata(struct si_screen *sscreen, PIPE_SWIZZLE_W }; uint32_t desc[8], i; - bool is_array = util_resource_is_array_texture(res); + bool is_array = util_texture_is_array(res->target); /* DRM 2.x.x doesn't support this. */ if (sscreen->info.drm_major != 3) |