diff options
author | Robert Phillips <robertphillips@google.com> | 2018-06-19 13:09:54 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-06-19 19:51:20 +0000 |
commit | c994a93b327235182c6d29a782c409b2c58476ae (patch) | |
tree | dba9ab1ff4a414e76da883f47ee90acbf0f27868 /gm | |
parent | 4d75975b70c454288226afc03e512ad9bc2db5ac (diff) |
Move op memory storage to GrContext (take 2)
TBR=bsalomon@google.com
Change-Id: I4a448694d4114d83cd3a720cfc8bd37de51733d1
Reviewed-on: https://skia-review.googlesource.com/135707
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/atlastext.cpp | 2 | ||||
-rw-r--r-- | gm/beziereffects.cpp | 13 | ||||
-rw-r--r-- | gm/convexpolyeffect.cpp | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp index 226b83fdd7..c30a6754db 100644 --- a/gm/atlastext.cpp +++ b/gm/atlastext.cpp @@ -8,6 +8,7 @@ #include "gm.h" #if SK_SUPPORT_ATLAS_TEXT +#include "GrContext.h" #include "SkAtlasTextContext.h" #include "SkAtlasTextFont.h" @@ -72,6 +73,7 @@ protected: if (!targetHandle) { return; } + fTarget = SkAtlasTextTarget::Make(fContext, kSize, kSize, targetHandle); fTypefaces[0] = sk_tool_utils::create_portable_typeface("serif", SkFontStyle::Italic()); diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index dea6150549..1c26989df2 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -80,7 +80,9 @@ public: sk_sp<GrGeometryProcessor> gp, const SkRect& rect, GrColor color) { - return std::unique_ptr<GrDrawOp>(new BezierCubicTestOp(std::move(gp), rect, color)); + GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); + + return pool->allocate<BezierCubicTestOp>(std::move(gp), rect, color); } private: @@ -264,8 +266,9 @@ public: const SkRect& rect, GrColor color, const SkMatrix& klm) { - return std::unique_ptr<GrMeshDrawOp>( - new BezierConicTestOp(std::move(gp), rect, color, klm)); + GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); + + return pool->allocate<BezierConicTestOp>(std::move(gp), rect, color, klm); } private: @@ -485,7 +488,9 @@ public: const SkRect& rect, GrColor color, const GrPathUtils::QuadUVMatrix& devToUV) { - return std::unique_ptr<GrDrawOp>(new BezierQuadTestOp(std::move(gp), rect, color, devToUV)); + GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); + + return pool->allocate<BezierQuadTestOp>(std::move(gp), rect, color, devToUV); } private: diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 8f8d1b4d50..18c5ebdcdc 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -45,7 +45,9 @@ public: static std::unique_ptr<GrDrawOp> Make(GrContext* context, GrPaint&& paint, const SkRect& rect) { - return std::unique_ptr<GrDrawOp>(new PolyBoundsOp(std::move(paint), rect)); + GrOpMemoryPool* pool = context->contextPriv().opMemoryPool(); + + return pool->allocate<PolyBoundsOp>(std::move(paint), rect); } const char* name() const override { return "PolyBoundsOp"; } |