commit 6b109c74982033d4a220cd10a0eab8b024b351c9
author Chris Craik <ccraik@google.com> Fri Feb 27 10:55:28 2015 -0800
committer Chris Craik <ccraik@google.com> Fri Feb 27 16:13:26 2015 -0800
tree 1e812780630475ff43c9a7f84bcf392996b43ac0
parent 26bf34200e40a0fa8c66366559aa016380cd8c6f

Fix glop rendering within unclipped saveLayers

bug:19541881

Additionally, clean up GlopBuilders
and rename onGetSnapshot() for clarity

Change-Id: I0303e4cd61eef87cf80af2d968c4aa67193cd008

libs/hwui/OpenGLRenderer.h

diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h
index ae53313..63a63b8 100755
--- a/libs/hwui/OpenGLRenderer.h
+++ b/libs/hwui/OpenGLRenderer.h
@@ -426,7 +426,7 @@
 
     virtual void onViewportInitialized() override;
     virtual void onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) override;
-    virtual GLuint onGetTargetFbo() const override { return 0; }
+    virtual GLuint getTargetFbo() const override { return 0; }
 
     SkPath* allocPathForFrame() {
         std::unique_ptr<SkPath> path(new SkPath());
@@ -569,7 +569,7 @@
     RenderState& mRenderState;
 
 private:
-    void renderGlop(const Glop& glop);
+    void renderGlop(const Glop& glop, bool clearLayer = true);
 
     /**
      * Discards the content of the framebuffer if supported by the driver.