gallium/radeon: reallocate textures with non-zero tile_swizzle on export

Reviewed-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_texture.c b/src/gallium/drivers/radeon/r600_texture.c
index 2d58dc9649942d43b39fcd4bf68b60a0494fa8f7..07df2d43017a3b6a6567b49a79c93d2f4b4f34bb 100644 (file)
--- a/src/gallium/drivers/radeon/r600_texture.c
+++ b/src/gallium/drivers/radeon/r600_texture.c
@@ -568,13 +568,15 @@ static boolean r600_texture_get_handle(struct pipe_screen* screen,
                        return false;
 
                /* Move a suballocated texture into a non-suballocated allocation. */
-               if (rscreen->ws->buffer_is_suballocated(res->buf)) {
+               if (rscreen->ws->buffer_is_suballocated(res->buf) ||
+                   rtex->surface.tile_swizzle) {
                        assert(!res->b.is_shared);
                        r600_reallocate_texture_inplace(rctx, rtex,
                                                        PIPE_BIND_SHARED, false);
                        rctx->b.flush(&rctx->b, NULL, 0);
                        assert(res->b.b.bind & PIPE_BIND_SHARED);
                        assert(res->flags & RADEON_FLAG_NO_SUBALLOC);
+                       assert(rtex->surface.tile_swizzle == 0);
                }
 
                /* Since shader image stores don't support DCC on VI,