[Mesa-dev] [PATCH] svga: fix breakage in create_backed_surface_view()

[Charmaine Lee]

Reviewed-by: Charmaine Lee <charmainel at vmware.com>
________________________________________
From: Brian Paul <brianp at vmware.com>
Sent: Sunday, July 9, 2017 1:00 PM
To: mesa-dev at lists.freedesktop.org
Cc: Charmaine Lee
Subject: [PATCH] svga: fix breakage in create_backed_surface_view()

This fixes a regression in some piglit tests since commit 5e5d5f1a2eb.
I think I mis-resolved the merge conflict when cherry-picking that
commit to master.
---
 src/gallium/drivers/svga/svga_surface.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_surface.c b/src/gallium/drivers/svga/svga_surface.c
index 1f50b9c..d7c9850 100644
--- a/src/gallium/drivers/svga/svga_surface.c
+++ b/src/gallium/drivers/svga/svga_surface.c
@@ -446,6 +446,8 @@ create_backed_surface_view(struct svga_context *svga, struct svga_surface *s)
          goto done;

       s->backed = svga_surface(backed_view);
+
+      SVGA_STATS_TIME_POP(svga_sws(svga));
    }
    else if (s->backed->age < tex->age) {
       /*
@@ -474,12 +476,9 @@ create_backed_surface_view(struct svga_context *svga, struct svga_surface *s)
                                         bs->key.numMipLevels,
                                         bs->key.numFaces * bs->key.arraySize,
                                         zslice, s->base.u.tex.level, layer);
-
-      svga_mark_surface_dirty(&s->backed->base);
-
-      SVGA_STATS_TIME_POP(svga_sws(svga));
    }

+   svga_mark_surface_dirty(&s->backed->base);
    s->backed->age = tex->age;

 done:
--
1.9.1