From f8f71cb6f394b8b655e760a6acec8ccff1a89cfc Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sun, 9 Jul 2017 12:45:28 -0700 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. Reviewed-by: Charmaine Lee --- 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 1f50b9cd057..d7c9850e68e 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: -- 2.30.2