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

Merge "fix a small bug that caused screenshot to show garbage in some cases (DO NOT MERGE)" into gingerbread

Browse Source
This commit is contained in:
Mathias Agopian
2011-01-25 14:43:09 -08:00
committed by Android (Google) Code Review
parent 043a3cddf6 8aa11d82f3
commit d0441f921b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/surfaceflinger/SurfaceFlinger.cpp
View File

@@ -2114,6 +2114,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
// invert everything, b/c glReadPixel() below will invert the FB // invert everything, b/c glReadPixel() below will invert the FB
glViewport(0, 0, sw, sh); glViewport(0, 0, sw, sh);
glScissor(0, 0, sw, sh);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glPushMatrix(); glPushMatrix();
glLoadIdentity(); glLoadIdentity();
@@ -2123,6 +2124,7 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
// redraw the screen entirely... // redraw the screen entirely...
glClearColor(0,0,0,1); glClearColor(0,0,0,1);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ); const Vector< sp<LayerBase> >& layers(mVisibleLayersSortedByZ);
const size_t count = layers.size(); const size_t count = layers.size();
for (size_t i=0 ; i<count ; ++i) { for (size_t i=0 ; i<count ; ++i) {
@@ -2157,7 +2159,6 @@ status_t SurfaceFlinger::captureScreenImplLocked(DisplayID dpy,
result = NO_MEMORY; result = NO_MEMORY;
} }
} }
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glViewport(0, 0, hw_w, hw_h); glViewport(0, 0, hw_w, hw_h);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);