Check result of D3D11 map operation in Blit11::copyAndConvert.

vonture · Commit Bot · commit a571f28d4034 · 2018-03-26T16:19:47.000Z
BUG=825503 Change-Id: I407ded1970266bc4fa975850d5700544b9f17b4b Reviewed-on: https://chromium-review.googlesource.com/980693 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
diff --git a/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp b/src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
@@ -1551,7 +1551,7 @@ gl::Error Blit11::copyAndConvert(const TextureHelper11 &source,
     if (mRenderer->getWorkarounds().depthStencilBlitExtraCopy)
     {
         D3D11_MAPPED_SUBRESOURCE mapped;
-        deviceContext->Map(destStaging.get(), 0, D3D11_MAP_READ, 0, &mapped);
+        ANGLE_TRY(mRenderer->mapResource(destStaging.get(), 0, D3D11_MAP_READ, 0, &mapped));
         deviceContext->UpdateSubresource(dest.get(), destSubresource, nullptr, mapped.pData,
                                          mapped.RowPitch, mapped.DepthPitch);
         deviceContext->Unmap(destStaging.get(), 0);

Original file line number	Diff line number	Diff line change
`@@ -1551,7 +1551,7 @@ gl::Error Blit11::copyAndConvert(const TextureHelper11 &source,`
`1551`	`1551`	`if (mRenderer->getWorkarounds().depthStencilBlitExtraCopy)`
`1552`	`1552`	`{`
`1553`	`1553`	`D3D11_MAPPED_SUBRESOURCE mapped;`
`1554`		`- deviceContext->Map(destStaging.get(), 0, D3D11_MAP_READ, 0, &mapped);`
	`1554`	`+ ANGLE_TRY(mRenderer->mapResource(destStaging.get(), 0, D3D11_MAP_READ, 0, &mapped));`
`1555`	`1555`	`deviceContext->UpdateSubresource(dest.get(), destSubresource, nullptr, mapped.pData,`
`1556`	`1556`	`mapped.RowPitch, mapped.DepthPitch);`
`1557`	`1557`	`deviceContext->Unmap(destStaging.get(), 0);`