commit 0519c810a56bded1284fcb2ae40f438878c6585f
author Chris Craik <ccraik@google.com> Wed Feb 11 13:17:06 2015 -0800
committer Chris Craik <ccraik@google.com> Thu Feb 12 12:30:59 2015 -0800
tree d5e0a81ea08b9f3fc9d5e8d78b770a8c77aa4535
parent 08fa43fdeb646f56edcd8b33d06ee7d79b203426

Glop Bitmap and RoundRect clipping support

Change-Id: I4577546a5d2e5f084cc03f39a89db9231b8111ee

libs/hwui/GlopBuilder.h

diff --git a/libs/hwui/GlopBuilder.h b/libs/hwui/GlopBuilder.h
index 48ce81a..04d421c 100644
--- a/libs/hwui/GlopBuilder.h
+++ b/libs/hwui/GlopBuilder.h
@@ -38,25 +38,35 @@
     GlopBuilder(RenderState& renderState, Caches& caches, Glop* outGlop);
 
     GlopBuilder& setMeshUnitQuad();
+    GlopBuilder& setMeshTexturedUnitQuad(const UvMapper* uvMapper, bool isAlphaMaskTexture);
     GlopBuilder& setMeshVertexBuffer(const VertexBuffer& vertexBuffer, bool shadowInterp);
     GlopBuilder& setMeshIndexedQuads(void* vertexData, int quadCount);
 
-    GlopBuilder& setTransform(const Matrix4& ortho, const Matrix4& transform, bool fudgingOffset);
+    GlopBuilder& setFillPaint(const SkPaint& paint, float alphaScale);
+    GlopBuilder& setFillTexturePaint(Texture& texture, bool isAlphaMaskTexture,
+            const SkPaint* paint, float alphaScale);
+
+    GlopBuilder& setTransformClip(const Matrix4& ortho, const Matrix4& transform, bool fudgingOffset);
 
     GlopBuilder& setModelViewMapUnitToRect(const Rect destination);
+    GlopBuilder& setModelViewMapUnitToRectSnap(const Rect destination);
     GlopBuilder& setModelViewOffsetRect(float offsetX, float offsetY, const Rect source);
 
-    GlopBuilder& setOptionalPaint(const SkPaint* paint, float alphaScale);
-    GlopBuilder& setPaint(const SkPaint& paint, float alphaScale);
+    GlopBuilder& setRoundRectClipState(const RoundRectClipState* roundRectClipState);
+
     void build();
 private:
+    void setFill(int color, float alphaScale, SkXfermode::Mode mode,
+            const SkShader* shader, const SkColorFilter* colorFilter);
+
     enum StageFlags {
         kInitialStage = 0,
         kMeshStage = 1 << 0,
         kTransformStage = 1 << 1,
         kModelViewStage = 1 << 2,
         kFillStage = 1 << 3,
-        kAllStages = kMeshStage | kTransformStage | kModelViewStage | kFillStage,
+        kRoundRectClipStage = 1 << 4,
+        kAllStages = kMeshStage | kFillStage | kTransformStage | kModelViewStage | kRoundRectClipStage,
     } mStageFlags;
 
     ProgramDescription mDescription;