diff options
author | Brian Salomon <bsalomon@google.com> | 2017-12-07 14:34:36 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-08 13:41:10 +0000 |
commit | f06c3582677270c741a5e4fb366ec8b5d4ec4c21 (patch) | |
tree | be9fb470ef48933fdd5b6deb18ab3a01d373686b /src/gpu/GrGpu.h | |
parent | 852ca318a16f9c455d2bed3efb2063dff0e4d068 (diff) |
Remove instanced rendering
Change-Id: I4219b1d23a647b849ee41fe71b53e1c45edfc3f4
Reviewed-on: https://skia-review.googlesource.com/82241
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/GrGpu.h')
-rw-r--r-- | src/gpu/GrGpu.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/gpu/GrGpu.h b/src/gpu/GrGpu.h index 18ea772f23..cf91dbe53d 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/GrGpu.h @@ -15,7 +15,6 @@ #include "GrTextureProducer.h" #include "GrTypes.h" #include "GrXferProcessor.h" -#include "instanced/InstancedRendering.h" #include "SkPath.h" #include "SkTArray.h" #include <map> @@ -42,12 +41,6 @@ class GrSurface; class GrTexture; class SkJSONWriter; -namespace gr_instanced { - class InstancedOp; - class InstancedRendering; - class OpAllocator; -} - class GrGpu : public SkRefCnt { public: /** @@ -153,12 +146,6 @@ public: const void* data = nullptr); /** - * Creates an instanced rendering object if it is supported on this platform. - */ - std::unique_ptr<gr_instanced::OpAllocator> createInstancedRenderingAllocator(); - gr_instanced::InstancedRendering* createInstancedRendering(); - - /** * Resolves MSAA. */ void resolveRenderTarget(GrRenderTarget*, GrSurfaceOrigin); @@ -567,11 +554,6 @@ private: virtual GrBuffer* onCreateBuffer(size_t size, GrBufferType intendedType, GrAccessPattern, const void* data) = 0; - virtual gr_instanced::InstancedRendering* onCreateInstancedRendering() = 0; - virtual std::unique_ptr<gr_instanced::OpAllocator> onCreateInstancedRenderingAllocator() { - return nullptr; - } - virtual bool onIsACopyNeededForTextureParams(GrTextureProxy* proxy, const GrSamplerState&, GrTextureProducer::CopyParams*, SkScalar scaleAdjust[2]) const { @@ -644,7 +626,6 @@ private: GrContext* fContext; friend class GrPathRendering; - friend class gr_instanced::InstancedOp; // for xferBarrier typedef SkRefCnt INHERITED; }; |