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

am ed96349a: am 3d1b158e: Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev

Browse Source 
* commit 'ed96349a43133625d76fe7ba52ee4893c741ec41':
  Fix out of range glCopyTexImage2D Bug #9425270
This commit is contained in:
Romain Guy
2013-06-28 11:10:59 -07:00
committed by Android Git Automerger
parent 3f0decd7df ed96349a43
commit 55e789dbc7
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/hwui/OpenGLRenderer.cpp
View File

@@ -882,15 +882,18 @@ bool OpenGLRenderer::createLayer(float left, float top, float right, float botto
layer->bindTexture();
if (!bounds.isEmpty()) {
if (layer->isEmpty()) {
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
bounds.left, mSnapshot->height - bounds.bottom,
layer->getWidth(), layer->getHeight(), 0);
// Workaround for some GL drivers. When reading pixels lying outside
// of the window we should get undefined values for those pixels.
// Unfortunately some drivers will turn the entire target texture black
// when reading outside of the window.
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, layer->getWidth(), layer->getHeight(),
0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
layer->setEmpty(false);
} else {
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, bounds.left,
mSnapshot->height - bounds.bottom, bounds.getWidth(), bounds.getHeight());
}
glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, bounds.left,
mSnapshot->height - bounds.bottom, bounds.getWidth(), bounds.getHeight());
// Enqueue the buffer coordinates to clear the corresponding region later
mLayers.push(new Rect(bounds));
}