Merge changes Ib0a0b7d1,Ibec4b2aa into jb-mr1-dev

* changes:
  Fix overdraw debug on QCOM
  Make sure we never bind to texture #0 Bug #7195815

1 files changed, 3 insertions, 5 deletions

diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index 22f1decc7ad5..898962a4ced7 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -435,15 +435,13 @@ void Caches::resetScissor() {
 ///////////////////////////////////////////////////////////////////////////////
 
 void Caches::startTiling(GLuint x, GLuint y, GLuint width, GLuint height, bool opaque) {
-    if (extensions.hasTiledRendering()) {
-        glStartTilingQCOM(x, y, width, height,
-                (opaque ? GL_NONE : GL_COLOR_BUFFER_BIT0_QCOM) |
-                (debugOverdraw ? GL_STENCIL_BUFFER_BIT0_QCOM : 0));
+    if (extensions.hasTiledRendering() && !debugOverdraw) {
+        glStartTilingQCOM(x, y, width, height, (opaque ? GL_NONE : GL_COLOR_BUFFER_BIT0_QCOM));
     }
 }
 
 void Caches::endTiling() {
-    if (extensions.hasTiledRendering()) {
+    if (extensions.hasTiledRendering() && !debugOverdraw) {
         glEndTilingQCOM(GL_COLOR_BUFFER_BIT0_QCOM);
     }
 }