ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b2c1cfbe: am 0cd545f1: sometimes we would incorrectly scale the content of a surface

Browse Source 
* commit 'b2c1cfbe95bed419487455d1b82956f9c5b2a40c':
  sometimes we would incorrectly scale the content of a surface
This commit is contained in:
Mathias Agopian 2012-06-07 17:21:53 -07:00 committed by Android Git Automerger
commit af1cb83516
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
services/surfaceflinger/Layer.cpp
View File

@ -469,18 +469,31 @@ uint32_t Layer::doTransaction(uint32_t flags)
front.requested.crop.getWidth(), front.requested.crop.getWidth(),
front.requested.crop.getHeight()); front.requested.crop.getHeight());
if (!isFixedSize()) {
// this will make sure LayerBase::doTransaction doesn't update
// the drawing state's geometry
flags |= eDontUpdateGeometryState;
}
// record the new size, form this point on, when the client request // record the new size, form this point on, when the client request
// a buffer, it'll get the new size. // a buffer, it'll get the new size.
mSurfaceTexture->setDefaultBufferSize( mSurfaceTexture->setDefaultBufferSize(
temp.requested.w, temp.requested.h); temp.requested.w, temp.requested.h);
} }
if (!isFixedSize()) {
const bool resizePending = (temp.requested.w != temp.active.w) ||
(temp.requested.h != temp.active.h);
if (resizePending) {
// don't let LayerBase::doTransaction update the drawing state
// if we have a pending resize, unless we are in fixed-size mode.
// the drawing state will be updated only once we receive a buffer
// with the correct size.
//
// in particular, we want to make sure the clip (which is part
// of the geometry state) is latched together with the size but is
// latched immediately when no resizing is involved.
flags |= eDontUpdateGeometryState;
}
}
return LayerBase::doTransaction(flags); return LayerBase::doTransaction(flags);
} }