radv: use 3d shader for gfx9 copies if dst is 3d
authorDave Airlie <airlied@redhat.com>
Mon, 3 Dec 2018 04:38:28 +0000 (14:38 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 4 Dec 2018 00:42:31 +0000 (10:42 +1000)
This fixes some crucible 3d miptree tests I've been working on
when executed using the compute shader path.

Fixes: d08f267814 (radv/gfx9: fix 3d image to image transfers on compute queues.)
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
src/amd/vulkan/radv_meta_bufimage.c

index f5b68f6c9a6a907fe55db138669ddce83a3898b9..e0dc7151556b48c6564564c781fa71f130df4dbd 100644 (file)
@@ -2061,7 +2061,7 @@ radv_meta_image_to_image_cs(struct radv_cmd_buffer *cmd_buffer,
        itoi_bind_descriptors(cmd_buffer, &src_view, &dst_view);
 
        if (device->physical_device->rad_info.chip_class >= GFX9 &&
-           src->image->type == VK_IMAGE_TYPE_3D)
+           (src->image->type == VK_IMAGE_TYPE_3D || dst->image->type == VK_IMAGE_TYPE_3D))
                pipeline = cmd_buffer->device->meta_state.itoi.pipeline_3d;
        radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer),
                             VK_PIPELINE_BIND_POINT_COMPUTE, pipeline);