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 717393 - Part 3: Cache ClippedGeometry for D2D Azure backend. r=jrmuizel

Browse Source
This commit is contained in:
Bas Schouten 2012-05-15 16:57:51 +02:00
parent 28581d2aad
commit 9348b020c7
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gfx/2d/DrawTargetD2D.cpp
View File

@ -939,6 +939,7 @@ DrawTargetD2D::PushClip(const Path *aPath)
}
mCurrentClipMaskTexture = NULL;
mCurrentClippedGeometry = NULL;
RefPtr<PathD2D> pathD2D = static_cast<PathD2D*>(const_cast<Path*>(aPath));
@ -977,6 +978,7 @@ void
DrawTargetD2D::PushClipRect(const Rect &aRect)
{
mCurrentClipMaskTexture = NULL;
mCurrentClippedGeometry = NULL;
if (!mTransform.IsRectilinear()) {
// Whoops, this isn't a rectangle in device space, Direct2D will not deal
// with this transform the way we want it to.
@ -1009,6 +1011,7 @@ void
DrawTargetD2D::PopClip()
{
mCurrentClipMaskTexture = NULL;
mCurrentClippedGeometry = NULL;
if (mClipsArePushed) {
if (mPushedClips.back().mLayer) {
mRT->PopLayer();
@ -1531,11 +1534,14 @@ DrawTargetD2D::FinalizeRTForOperation(CompositionOp aOperator, const Pattern &aP
TemporaryRef<ID2D1Geometry>
DrawTargetD2D::GetClippedGeometry()
{
RefPtr<ID2D1GeometrySink> currentSink;
RefPtr<ID2D1PathGeometry> clippedGeometry;
if (mCurrentClippedGeometry) {
return mCurrentClippedGeometry;
}
factory()->CreatePathGeometry(byRef(clippedGeometry));
clippedGeometry->Open(byRef(currentSink));
RefPtr<ID2D1GeometrySink> currentSink;
factory()->CreatePathGeometry(byRef(mCurrentClippedGeometry));
mCurrentClippedGeometry->Open(byRef(currentSink));
std::vector<DrawTargetD2D::PushedClip>::iterator iter = mPushedClips.begin();
@ -1558,21 +1564,21 @@ DrawTargetD2D::GetClippedGeometry()
newGeom->Open(byRef(currentSink));
if (iter->mPath) {
clippedGeometry->CombineWithGeometry(iter->mPath->GetGeometry(), D2D1_COMBINE_MODE_INTERSECT,
mCurrentClippedGeometry->CombineWithGeometry(iter->mPath->GetGeometry(), D2D1_COMBINE_MODE_INTERSECT,
iter->mTransform, currentSink);
} else {
RefPtr<ID2D1RectangleGeometry> rectGeom;
factory()->CreateRectangleGeometry(iter->mBounds, byRef(rectGeom));
clippedGeometry->CombineWithGeometry(rectGeom, D2D1_COMBINE_MODE_INTERSECT,
D2D1::IdentityMatrix(), currentSink);
mCurrentClippedGeometry->CombineWithGeometry(rectGeom, D2D1_COMBINE_MODE_INTERSECT,
D2D1::IdentityMatrix(), currentSink);
}
currentSink->Close();
clippedGeometry = newGeom;
mCurrentClippedGeometry = newGeom;
}
return clippedGeometry;
return mCurrentClippedGeometry;
}
TemporaryRef<ID2D1RenderTarget>

1
gfx/2d/DrawTargetD2D.h
View File

@ -215,6 +215,7 @@ private:
RefPtr<ID3D10Device1> mDevice;
RefPtr<ID3D10Texture2D> mTexture;
RefPtr<ID3D10Texture2D> mCurrentClipMaskTexture;
RefPtr<ID2D1PathGeometry> mCurrentClippedGeometry;
mutable RefPtr<ID2D1RenderTarget> mRT;
// Temporary texture and render target used for supporting alternative operators.