radeonsi: Count planes for imported textures.
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Mon, 27 Apr 2020 22:40:12 +0000 (00:40 +0200)
committerMarge Bot <eric+marge@anholt.net>
Tue, 28 Apr 2020 11:16:03 +0000 (11:16 +0000)
For the DRI2 lowered YUV import separate pipe_resources get created
but in the end the first resource just gets asked for NPLANES.

Since

1) (Almost) everything uses the first resource + a plane index in the
  Gallium interface.
2) This mirrors non-imported textures.

lets fix this in the driver.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4779>

src/gallium/drivers/radeonsi/si_texture.c

index db4704575511d0998bdeb8f200c570690f39bef8..6b4ff99b0891cd426ab10ee2bf636f5122f31633 100644 (file)
@@ -1659,6 +1659,15 @@ static struct pipe_resource *si_texture_from_winsys_buffer(struct si_screen *ssc
    tex->buffer.external_usage = usage;
    tex->num_planes = 1;
 
+   /* Account for multiple planes with lowered yuv import. */
+   struct pipe_resource *next_plane = tex->buffer.b.b.next;
+   while(next_plane) {
+      struct si_texture *next_tex = (struct si_texture *)next_plane;
+      ++next_tex->num_planes;
+      ++tex->num_planes;
+      next_plane = next_plane->next;
+   }
+
    if (!si_read_tex_bo_metadata(sscreen, tex, offset, &metadata)) {
       si_texture_reference(&tex, NULL);
       return NULL;