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/gl/GrGLGpu.cpp | |
| 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/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index fe860c4610..c11f598b7a 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -37,7 +37,6 @@ #include "SkTraceEvent.h" #include "SkTypes.h" #include "builders/GrGLShaderStringBuilder.h" -#include "instanced/GLInstancedRendering.h" #define GL_CALL(X) GR_GL_CALL(this->glInterface(), X) #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glInterface(), RET, X) @@ -58,12 +57,6 @@ /////////////////////////////////////////////////////////////////////////////// -using gr_instanced::InstancedRendering; -using gr_instanced::GLInstancedRendering; - -using gr_instanced::OpAllocator; -using gr_instanced::GLOpAllocator; - static const GrGLenum gXfermodeEquation2Blend[] = { // Basic OpenGL blend equations. GR_GL_FUNC_ADD, @@ -1732,15 +1725,6 @@ GrBuffer* GrGLGpu::onCreateBuffer(size_t size, GrBufferType intendedType, return GrGLBuffer::Create(this, size, intendedType, accessPattern, data); } - -std::unique_ptr<OpAllocator> GrGLGpu::onCreateInstancedRenderingAllocator() { - return std::unique_ptr<OpAllocator>(new GLOpAllocator(this->caps())); -} - -InstancedRendering* GrGLGpu::onCreateInstancedRendering() { - return new GLInstancedRendering(this); -} - void GrGLGpu::flushScissor(const GrScissorState& scissorState, const GrGLIRect& rtViewport, GrSurfaceOrigin rtOrigin) { |