Merge "Fix out of range glCopyTexImage2D Bug #9425270" into jb-mr2-dev
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index ddb190e..7735819 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -882,15 +882,18 @@
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));
}
