we were not always clearing the screen properly

Change-Id: I269dd866e965aebd9b3c4667095818202982f4a3
This commit is contained in:
Mathias Agopian 2012-08-27 18:54:24 -07:00
parent 525705c88f
commit 55801e41e6
2 changed files with 13 additions and 13 deletions

View File

@ -1288,7 +1288,7 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
// screen is already cleared here
if (!region.isEmpty()) {
// can happen with SurfaceView
drawWormhole(region);
drawWormhole(hw, region);
}
}
@ -1328,27 +1328,26 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
}
}
void SurfaceFlinger::drawWormhole(const Region& region) const
void SurfaceFlinger::drawWormhole(const sp<const DisplayDevice>& hw,
const Region& region) const
{
glDisable(GL_TEXTURE_EXTERNAL_OES);
glDisable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
glColor4f(0,0,0,0);
GLfloat vertices[4][2];
glVertexPointer(2, GL_FLOAT, 0, vertices);
const int32_t height = hw->getHeight();
Region::const_iterator it = region.begin();
Region::const_iterator const end = region.end();
while (it != end) {
const Rect& r = *it++;
vertices[0][0] = r.left;
vertices[0][1] = r.top;
vertices[1][0] = r.right;
vertices[1][1] = r.top;
vertices[2][0] = r.right;
vertices[2][1] = r.bottom;
vertices[3][0] = r.left;
vertices[3][1] = r.bottom;
GLfloat vertices[][2] = {
{ r.left, height - r.top },
{ r.left, height - r.bottom },
{ r.right, height - r.bottom },
{ r.right, height - r.top }
};
glVertexPointer(2, GL_FLOAT, 0, vertices);
glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
}
}

View File

@ -367,7 +367,8 @@ private:
const Region& dirty);
void postFramebuffer();
void drawWormhole(const Region& region) const;
void drawWormhole(const sp<const DisplayDevice>& hw,
const Region& region) const;
GLuint getProtectedTexName() const {
return mProtectedTexName;
}