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 <sroland@vmware.com>
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/auxiliary/util/u_resource.h b/src/gallium/auxiliary/util/u_resource.h
index 6736476f4da9aa91a37a6915fb8791b815ba5e6a..3c6194b8f07bef07a13689268cf4bff18afec89b 100644 (file)
--- 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 cb69398e6af3ffcceff363b34ae6d0e13ce41a7e..66d4f02622fd9be849d33643019f9d3a7694bd51 100644 (file)
--- 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)