diff options
| author |  csmartdalton <csmartdalton@google.com> | 2016-07-29 08:14:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-29 08:14:20 -0700 |
| commit | e0d362929d6569e8737d80dead791c640390e819 (patch) | |
| tree | 3943140ef518a4fc3962672a74039cb776f1ef48 /src/gpu/gl/GrGLGpu.cpp | |
| parent | 0d9990f052670a8af29e1e775c414810f8fc6e86 (diff) | |
Add test configs for instanced rendering
Adds the following configs and enables them on select bots:
glinst, glinst4, glinstdit4, glinst16, glinstdit16,
esinst, esinst4, esinstdit4
Makes general changes to GrContextOptions, GrCaps, etc. to facilitate
this.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2182783004
Review-Url: https://codereview.chromium.org/2182783004
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index ec38804da3..c91a0f46fa 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -479,10 +479,6 @@ void GrGLGpu::disconnect(DisconnectType type) { /////////////////////////////////////////////////////////////////////////////// -InstancedRendering* GrGLGpu::createInstancedRenderingIfSupported() { - return GLInstancedRendering::CreateIfSupported(this); -} - void GrGLGpu::onResetContext(uint32_t resetBits) { // we don't use the zb at all if (resetBits & kMisc_GrGLBackendState) { @@ -1965,6 +1961,10 @@ GrBuffer* GrGLGpu::onCreateBuffer(size_t size, GrBufferType intendedType, return GrGLBuffer::Create(this, size, intendedType, accessPattern, data); } +InstancedRendering* GrGLGpu::onCreateInstancedRendering() { + return new GLInstancedRendering(this); +} + void GrGLGpu::flushScissor(const GrScissorState& scissorState, const GrGLIRect& rtViewport, GrSurfaceOrigin rtOrigin) { |