diff options
author | Michel Dänzer <[email protected]> | 2019-07-17 12:16:15 +0200 |
---|---|---|
committer | Michel Dänzer <[email protected]> | 2019-07-23 16:26:04 +0200 |
commit | 7499e7362d70c315399731eb20b89478ba794846 (patch) | |
tree | 417b713b50937dea81f7ca37f4f2e37e5c5cbb16 /src/gallium/drivers | |
parent | 2f93ecd654e9909c0371cc131ab0e26e6edcdda0 (diff) |
radeonsi: Allow PIPE_TEXTURE_2D_ARRAY in si_texture_from_handle
Needed for the following st/mesa fix.
Acked-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_texture.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c index 2e31fbe94ad..3a5cd1cb187 100644 --- a/src/gallium/drivers/radeonsi/si_texture.c +++ b/src/gallium/drivers/radeonsi/si_texture.c @@ -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, |