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

am f8e5c37b: am 135e5899: save/restore viewport properly when taking screenshot

Browse Source 
* commit 'f8e5c37bc59c70b0a0388f8a690d0d4bead9cc6f':
  save/restore viewport properly when taking screenshot
This commit is contained in:
Mathias Agopian 2012-10-01 13:46:10 -07:00 committed by Android Git Automerger
commit 4c5158639b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
services/surfaceflinger/DisplayDevice.cpp
View File

@ -273,6 +273,7 @@ void DisplayDevice::setViewportAndProjection(const sp<const DisplayDevice>& hw)
glLoadIdentity(); glLoadIdentity();
// put the origin in the left-bottom corner // put the origin in the left-bottom corner
glOrthof(0, w, 0, h, 0, 1); // l=0, r=w ; b=0, t=h glOrthof(0, w, 0, h, 0, 1); // l=0, r=w ; b=0, t=h
glMatrixMode(GL_MODELVIEW);
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

4
services/surfaceflinger/SurfaceFlinger.cpp
View File

@ -2597,6 +2597,8 @@ status_t SurfaceFlinger::captureScreenImplLocked(const sp<IBinder>& display,
if (status == GL_FRAMEBUFFER_COMPLETE_OES) { if (status == GL_FRAMEBUFFER_COMPLETE_OES) {
// invert everything, b/c glReadPixel() below will invert the FB // invert everything, b/c glReadPixel() below will invert the FB
GLint viewport[4];
glGetIntegerv(GL_VIEWPORT, viewport);
glViewport(0, 0, sw, sh); glViewport(0, 0, sw, sh);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
@ -2645,7 +2647,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(const sp<IBinder>& display,
result = NO_MEMORY; result = NO_MEMORY;
} }
} }
glViewport(0, 0, hw_w, hw_h); glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPopMatrix(); glPopMatrix();
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);