Mesa (staging/19.1): virgl: Set meta data for textures from handle.

[GitLab Mirror]

Module: Mesa
Branch: staging/19.1
Commit: 3dea2e2ffc6c2f6eaf3b703635fbe3f0ed58ea43
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3dea2e2ffc6c2f6eaf3b703635fbe3f0ed58ea43

Author: Lepton Wu <lepton at chromium.org>
Date:   Wed Jul 17 10:02:20 2019 -0700

virgl: Set meta data for textures from handle.

The set of meta data was removed by commit 8083464. It broke lots of
dEQP tests when running with pbuffer surface type.

Fixes: 80834640137 ("virgl: remove dead code")
Signed-off-by: Lepton Wu <lepton at chromium.org>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Reviewed-by: Chia-I Wu <olvaffe at gmail.com>
(cherry picked from commit 6109df58e4abe18a0db589c3cebf21cbf0211197)

---

 src/gallium/drivers/virgl/virgl_resource.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gallium/drivers/virgl/virgl_resource.c b/src/gallium/drivers/virgl/virgl_resource.c
index ef81f213f40..6d4c9f5fd00 100644
--- a/src/gallium/drivers/virgl/virgl_resource.c
+++ b/src/gallium/drivers/virgl/virgl_resource.c
@@ -112,6 +112,7 @@ static struct pipe_resource *virgl_resource_from_handle(struct pipe_screen *scre
    res->u.b = *templ;
    res->u.b.screen = &vs->base;
    pipe_reference_init(&res->u.b.reference, 1);
+   virgl_resource_layout(&res->u.b, &res->metadata);
 
    res->hw_res = vs->vws->resource_create_from_handle(vs->vws, whandle);
    if (!res->hw_res) {