OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svga: fix breakage in create_backed_surface_view()

Browse Source 
This fixes a regression in some piglit tests since commit 5e5d5f1a2e.
I think I mis-resolved the merge conflict when cherry-picking that
commit to master.

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul
2017-07-09 12:45:28 -07:00
parent 781263486f
commit f8f71cb6f3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/svga/svga_surface.c
View File

@@ -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: