diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-12-01 10:59:09 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-01 16:45:27 +0000 |
| commit | 9afd371a8a66f992f98eb2a3fc75ae64bddc730b (patch) | |
| tree | 7c4853fe590fa370be28e92fe772356aa61b9ccd /src/gpu/instanced/InstancedRendering.h | |
| parent | 62458a6778bc39eea5360301a67d192b3a263df1 (diff) | |
Rename GrDrawBatch->GrDrawOp
Change-Id: I18f520924b8a2548566fd61dbea4e3e12bd253dd
Reviewed-on: https://skia-review.googlesource.com/5411
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Diffstat (limited to 'src/gpu/instanced/InstancedRendering.h')
| -rw-r--r-- | src/gpu/instanced/InstancedRendering.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gpu/instanced/InstancedRendering.h b/src/gpu/instanced/InstancedRendering.h index c94ca8aec7..d5cb3096ef 100644 --- a/src/gpu/instanced/InstancedRendering.h +++ b/src/gpu/instanced/InstancedRendering.h @@ -11,7 +11,7 @@ #include "GrGpu.h" #include "GrMemoryPool.h" #include "SkTInternalLList.h" -#include "batches/GrDrawBatch.h" +#include "batches/GrDrawOp.h" #include "instanced/InstancedRenderingTypes.h" #include "../private/GrInstancedPipelineInfo.h" @@ -45,29 +45,29 @@ public: * this class before attempting to flush batches returned by it. It is invalid to record new * draws between beginFlush() and endFlush(). */ - GrDrawBatch* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, - bool antialias, const GrInstancedPipelineInfo&, - bool* useHWAA); + GrDrawOp* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, + bool antialias, const GrInstancedPipelineInfo&, + bool* useHWAA); - GrDrawBatch* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, - const SkRect& localRect, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA); + GrDrawOp* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, + const SkRect& localRect, bool antialias, + const GrInstancedPipelineInfo&, bool* useHWAA); - GrDrawBatch* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, - const SkMatrix& localMatrix, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA); + GrDrawOp* SK_WARN_UNUSED_RESULT recordRect(const SkRect&, const SkMatrix&, GrColor, + const SkMatrix& localMatrix, bool antialias, + const GrInstancedPipelineInfo&, bool* useHWAA); - GrDrawBatch* SK_WARN_UNUSED_RESULT recordOval(const SkRect&, const SkMatrix&, GrColor, - bool antialias, const GrInstancedPipelineInfo&, - bool* useHWAA); + GrDrawOp* SK_WARN_UNUSED_RESULT recordOval(const SkRect&, const SkMatrix&, GrColor, + bool antialias, const GrInstancedPipelineInfo&, + bool* useHWAA); - GrDrawBatch* SK_WARN_UNUSED_RESULT recordRRect(const SkRRect&, const SkMatrix&, GrColor, - bool antialias, const GrInstancedPipelineInfo&, - bool* useHWAA); + GrDrawOp* SK_WARN_UNUSED_RESULT recordRRect(const SkRRect&, const SkMatrix&, GrColor, + bool antialias, const GrInstancedPipelineInfo&, + bool* useHWAA); - GrDrawBatch* SK_WARN_UNUSED_RESULT recordDRRect(const SkRRect& outer, const SkRRect& inner, - const SkMatrix&, GrColor, bool antialias, - const GrInstancedPipelineInfo&, bool* useHWAA); + GrDrawOp* SK_WARN_UNUSED_RESULT recordDRRect(const SkRRect& outer, const SkRRect& inner, + const SkMatrix&, GrColor, bool antialias, + const GrInstancedPipelineInfo&, bool* useHWAA); /** * Compiles all recorded draws into GPU buffers and allows the client to begin flushing the @@ -93,7 +93,7 @@ public: void resetGpuResources(ResetType); protected: - class Batch : public GrDrawBatch { + class Batch : public GrDrawOp { public: SK_DECLARE_INTERNAL_LLIST_INTERFACE(Batch); @@ -156,7 +156,7 @@ protected: Draw* fHeadDraw; Draw* fTailDraw; - typedef GrDrawBatch INHERITED; + typedef GrDrawOp INHERITED; friend class InstancedRendering; }; |