wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1251894 - In CompositorD3D11::CreateTexture, copy as much as the render target allows. r=bas, a=ritu

Browse Source 
MozReview-Commit-ID: KK5wu3T4tLE
This commit is contained in:
Markus Stange 2016-03-10 16:03:24 -05:00
parent 12d5089ebd
commit 4764fdcc93
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/layers/d3d11/CompositorD3D11.cpp
View File

@ -549,27 +549,31 @@ CompositorD3D11::CreateTexture(const gfx::IntRect& aRect,
const CompositingRenderTargetD3D11* sourceD3D11 =
static_cast<const CompositingRenderTargetD3D11*>(aSource);
D3D11_BOX srcBox;
srcBox.left = aSourcePoint.x;
srcBox.top = aSourcePoint.y;
srcBox.front = 0;
srcBox.right = aSourcePoint.x + aRect.width;
srcBox.bottom = aSourcePoint.y + aRect.height;
srcBox.back = 1;
const IntSize& srcSize = sourceD3D11->GetSize();
MOZ_ASSERT(srcSize.width >= 0 && srcSize.height >= 0,
"render targets should have nonnegative sizes");
if (srcBox.left < srcBox.right &&
srcBox.top < srcBox.bottom &&
srcBox.right <= static_cast<uint32_t>(srcSize.width) &&
srcBox.bottom <= static_cast<uint32_t>(srcSize.height)) {
IntRect srcRect(IntPoint(), srcSize);
IntRect copyRect(aSourcePoint, aRect.Size());
if (!srcRect.Contains(copyRect)) {
NS_WARNING("Could not copy the whole copy rect from the render target");
}
copyRect = copyRect.Intersect(srcRect);
if (!copyRect.IsEmpty()) {
D3D11_BOX copyBox;
copyBox.front = 0;
copyBox.back = 1;
copyBox.left = copyRect.x;
copyBox.top = copyRect.y;
copyBox.right = copyRect.XMost();
copyBox.bottom = copyRect.YMost();
mContext->CopySubresourceRegion(texture, 0,
0, 0, 0,
sourceD3D11->GetD3D11Texture(), 0,
&srcBox);
} else {
NS_WARNING("Could not copy render target - source rect out of bounds");
&copyBox);
}
}