Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actually fix pixelcopy for 90/180/270 rotation

Browse Source 
Bug: 33421965
Test: PixelCopyTest testWindow* CTS tests
Change-Id: I1b49b3643c5d030c3d2de95de4a0ce3a4ff0111d
This commit is contained in:
John Reck
2016-12-15 10:26:33 -08:00
parent 9f8ec54244
commit eb418edae4
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/hwui/OpenGLReadback.cpp
View File

@@ -108,6 +108,15 @@ CopyResult OpenGLReadback::copyGraphicBufferInto(GraphicBuffer* graphicBuffer, S
return copyGraphicBufferInto(graphicBuffer, transform, srcRect, bitmap);
}
static float sFlipVInit[16] = {
1, 0, 0, 0,
0, -1, 0, 0,
0, 0, 1, 0,
0, 1, 0, 1,
};
static const Matrix4 sFlipV(sFlipVInit);
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
@@ -183,11 +192,15 @@ inline CopyResult copyTextureInto(Caches& caches, RenderState& renderState,
Matrix4 croppedTexTransform(texTransform);
if (!srcRect.isEmpty()) {
croppedTexTransform.loadTranslate(srcRect.left / sourceTexture.width(),
// We flipV to convert to 0,0 top-left for the srcRect
// coordinates then flip back to 0,0 bottom-left for
// GLES coordinates.
croppedTexTransform.multiply(sFlipV);
croppedTexTransform.translate(srcRect.left / sourceTexture.width(),
srcRect.top / sourceTexture.height(), 0);
croppedTexTransform.scale(srcRect.getWidth() / sourceTexture.width(),
srcRect.getHeight() / sourceTexture.height(), 1);
croppedTexTransform.multiply(texTransform);
croppedTexTransform.multiply(sFlipV);
}
Glop glop;
GlopBuilder(renderState, caches, &glop)