diff options
Diffstat (limited to 'src/gpu/instanced/InstancedRendering.h')
| -rw-r--r-- | src/gpu/instanced/InstancedRendering.h | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/gpu/instanced/InstancedRendering.h b/src/gpu/instanced/InstancedRendering.h index d3a01523a6..903697436c 100644 --- a/src/gpu/instanced/InstancedRendering.h +++ b/src/gpu/instanced/InstancedRendering.h @@ -46,28 +46,25 @@ public: * draws between beginFlush() and endFlush(). */ GrDrawOp* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, - bool antialias, const GrInstancedPipelineInfo&, - bool* useHWAA); + GrAA, const GrInstancedPipelineInfo&, GrAAType*); GrDrawOp* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, - const SkRect& localRect, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA); + const SkRect& localRect, GrAA, + const GrInstancedPipelineInfo&, GrAAType*); GrDrawOp* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, - const SkMatrix& localMatrix, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA); + const SkMatrix& localMatrix, GrAA, + const GrInstancedPipelineInfo&, GrAAType*); GrDrawOp* SK_WARN_UNUSED_RESULT recordOval(const SkRect&, const SkMatrix&, GrColor, - bool antialias, const GrInstancedPipelineInfo&, - bool* useHWAA); + GrAA, const GrInstancedPipelineInfo&, GrAAType*); GrDrawOp* SK_WARN_UNUSED_RESULT recordRRect(const SkRRect&, const SkMatrix&, GrColor, - bool antialias, const GrInstancedPipelineInfo&, - bool* useHWAA); + GrAA, const GrInstancedPipelineInfo&, GrAAType*); GrDrawOp* SK_WARN_UNUSED_RESULT recordDRRect(const SkRRect& outer, const SkRRect& inner, - const SkMatrix&, GrColor, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA); + const SkMatrix&, GrColor, GrAA, + const GrInstancedPipelineInfo&, GrAAType*); /** * Compiles all recorded draws into GPU buffers and allows the client to begin flushing the @@ -182,11 +179,11 @@ private: Batch* SK_WARN_UNUSED_RESULT recordShape(ShapeType, const SkRect& bounds, const SkMatrix& viewMatrix, GrColor, - const SkRect& localRect, bool antialias, - const GrInstancedPipelineInfo&, bool* requireHWAA); + const SkRect& localRect, GrAA aa, + const GrInstancedPipelineInfo&, GrAAType*); - bool selectAntialiasMode(const SkMatrix& viewMatrix, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA, AntialiasMode*); + bool selectAntialiasMode(const SkMatrix& viewMatrix, GrAA aa, const GrInstancedPipelineInfo&, + GrAAType*, AntialiasMode*); virtual Batch* createBatch() = 0; |