Mesa (19.3): gallium: dri2: Use index as plane number.

[GitLab Mirror]

Module: Mesa
Branch: 19.3
Commit: 3211308e8832e571d5e7b558f0b29fdcef079563
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3211308e8832e571d5e7b558f0b29fdcef079563

Author: Lepton Wu <lepton at chromium.org>
Date:   Fri Nov  1 23:41:29 2019 -0700

gallium: dri2: Use index as plane number.

This fix wrong color when playing video under Android + virgl
configuration.

Fixes: 2decad495f3 ("gallium/dri2: Support images with multiple planes for modifiers")
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Lepton Wu <lepton at chromium.org>
(cherry picked from commit 5a40e153fd7df58a6419cf2e6211828d7d31cf4e)

---

 src/gallium/state_trackers/dri/dri2.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index 38b7c3f8b36..2a8ba40c36a 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -940,7 +940,7 @@ dri2_create_image_from_fd(__DRIscreen *_screen,
       whandles[i].stride = (unsigned)strides[index];
       whandles[i].offset = (unsigned)offsets[index];
       whandles[i].modifier = modifier;
-      whandles[i].plane = i;
+      whandles[i].plane = index;
    }
 
    img = dri2_create_image_from_winsys(_screen, width, height, use, map,