diff options
author | Chris Dalton <csmartdalton@google.com> | 2018-02-20 09:51:59 -0700 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-20 17:19:13 +0000 |
commit | 535ba8d2b862a364f7f8009d6e79cd41519f5643 (patch) | |
tree | 9a02a366b03b6172d94e01fea18138d755b01b87 /src/gpu/gl | |
parent | cfac205c5e1d31588ba5da2c7cb551f0d067de09 (diff) |
Drop unused support for MSAA sample locations
Bug: skia:
Change-Id: I96f0c25732d79c5881e400b121e81c5696a747a6
Reviewed-on: https://skia-review.googlesource.com/107441
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/gl')
-rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 32 | ||||
-rw-r--r-- | src/gpu/gl/GrGLGpu.h | 3 |
2 files changed, 0 insertions, 35 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 3cae7d3f3c..f2d44e6b63 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -4297,38 +4297,6 @@ bool GrGLGpu::generateMipmap(GrGLTexture* texture, GrSurfaceOrigin textureOrigin return true; } -void GrGLGpu::onQueryMultisampleSpecs(GrRenderTarget* rt, GrSurfaceOrigin rtOrigin, - const GrStencilSettings& stencil, - int* effectiveSampleCnt, SamplePattern* samplePattern) { - SkASSERT(GrFSAAType::kMixedSamples != rt->fsaaType() || - rt->renderTargetPriv().getStencilAttachment() || stencil.isDisabled()); - - this->flushStencil(stencil); - this->flushHWAAState(rt, true, !stencil.isDisabled()); - this->flushRenderTargetNoColorWrites(static_cast<GrGLRenderTarget*>(rt)); - - if (0 != this->caps()->maxRasterSamples()) { - GR_GL_GetIntegerv(this->glInterface(), GR_GL_EFFECTIVE_RASTER_SAMPLES, effectiveSampleCnt); - } else { - GR_GL_GetIntegerv(this->glInterface(), GR_GL_SAMPLES, effectiveSampleCnt); - } - - SkASSERT(*effectiveSampleCnt >= rt->numStencilSamples()); - - if (this->caps()->sampleLocationsSupport()) { - samplePattern->reset(*effectiveSampleCnt); - for (int i = 0; i < *effectiveSampleCnt; ++i) { - GrGLfloat pos[2]; - GL_CALL(GetMultisamplefv(GR_GL_SAMPLE_POSITION, i, pos)); - if (kTopLeft_GrSurfaceOrigin == rtOrigin) { - (*samplePattern)[i].set(pos[0], pos[1]); - } else { - (*samplePattern)[i].set(pos[0], 1 - pos[1]); - } - } - } -} - void GrGLGpu::xferBarrier(GrRenderTarget* rt, GrXferBarrierType type) { SkASSERT(type); switch (type) { diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/gl/GrGLGpu.h index 93b4de167d..5928232e0c 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/gl/GrGLGpu.h @@ -263,9 +263,6 @@ private: GrSurface* src, GrSurfaceOrigin srcOrigin, const SkIRect& srcRect, const SkIPoint& dstPoint) override; - void onQueryMultisampleSpecs(GrRenderTarget*, GrSurfaceOrigin, const GrStencilSettings&, - int* effectiveSampleCnt, SamplePattern*) override; - // binds texture unit in GL void setTextureUnit(int unitIdx); |