radeonsi: Allow PIPE_TEXTURE_2D_ARRAY in si_texture_from_handle
authorMichel Dänzer <michel.daenzer@amd.com>
Wed, 17 Jul 2019 10:16:15 +0000 (12:16 +0200)
committerMichel Dänzer <michel@daenzer.net>
Tue, 23 Jul 2019 14:26:04 +0000 (16:26 +0200)
Needed for the following st/mesa fix.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
src/gallium/drivers/radeonsi/si_texture.c

index 2e31fbe94ad465ddb74d250976ea9f2321256adf..3a5cd1cb187541a227562b1531877859bfc2cf94 100644 (file)
@@ -1718,8 +1718,9 @@ static struct pipe_resource *si_texture_from_handle(struct pipe_screen *screen,
        unsigned stride = 0, offset = 0;
 
        /* Support only 2D textures without mipmaps */
-       if ((templ->target != PIPE_TEXTURE_2D && templ->target != PIPE_TEXTURE_RECT) ||
-             templ->depth0 != 1 || templ->last_level != 0)
+       if ((templ->target != PIPE_TEXTURE_2D && templ->target != PIPE_TEXTURE_RECT &&
+            templ->target != PIPE_TEXTURE_2D_ARRAY) ||
+             templ->last_level != 0)
                return NULL;
 
        buf = sscreen->ws->buffer_from_handle(sscreen->ws, whandle,