am 135e5899
: save/restore viewport properly when taking screenshot
* commit '135e5899f70a67e62baaf6dbec7ba2ce611ca16a': save/restore viewport properly when taking screenshot
This commit is contained in:
commit
f8e5c37bc5
@ -273,6 +273,7 @@ void DisplayDevice::setViewportAndProjection(const sp<const DisplayDevice>& hw)
|
||||
glLoadIdentity();
|
||||
// put the origin in the left-bottom corner
|
||||
glOrthof(0, w, 0, h, 0, 1); // l=0, r=w ; b=0, t=h
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@ -2597,6 +2597,8 @@ status_t SurfaceFlinger::captureScreenImplLocked(const sp<IBinder>& display,
|
||||
if (status == GL_FRAMEBUFFER_COMPLETE_OES) {
|
||||
|
||||
// invert everything, b/c glReadPixel() below will invert the FB
|
||||
GLint viewport[4];
|
||||
glGetIntegerv(GL_VIEWPORT, viewport);
|
||||
glViewport(0, 0, sw, sh);
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glPushMatrix();
|
||||
@ -2645,7 +2647,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(const sp<IBinder>& display,
|
||||
result = NO_MEMORY;
|
||||
}
|
||||
}
|
||||
glViewport(0, 0, hw_w, hw_h);
|
||||
glViewport(viewport[0], viewport[1], viewport[2], viewport[3]);
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glPopMatrix();
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
|
Loading…
Reference in New Issue
Block a user