AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix resolve assert in vulkan

Browse Source 
Bug: skia:
Change-Id: I4fbf067112901a86faa7df301d3442281f563bcb
Reviewed-on: https://skia-review.googlesource.com/13767
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
This commit is contained in:
Greg Daniel 2017-04-18 16:40:35 -04:00 committed by Skia Commit-Bot
parent 9440345a81
commit 7d6f6666fe
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gpu/vk/GrVkGpu.cpp
View File

@ -412,7 +412,6 @@ void GrVkGpu::resolveImage(GrSurface* dst, GrVkRenderTarget* src, const SkIRect&
GrRenderTarget* dstRT = dst->asRenderTarget();
if (dstRT) {
GrVkRenderTarget* vkRT = static_cast<GrVkRenderTarget*>(dstRT);
SkASSERT(vkRT->numColorSamples() <= 1);
dstImage = vkRT;
} else {
SkASSERT(dst->asTexture());
@ -1583,8 +1582,10 @@ inline bool can_copy_as_resolve(const GrSurface* dst,
return false;
}
// The dst must not be a multisampled render target
if (dst->asRenderTarget() && dst->asRenderTarget()->numColorSamples() > 1) {
// The dst must not be a multisampled render target, expect in the case where the dst is the
// resolve texture connected to the msaa src. We check for this in case we are copying a part of
// a surface to a different region in the same surface.
if (dst->asRenderTarget() && dst->asRenderTarget()->numColorSamples() > 1 && dst != src) {
return false;
}