diff options
| author |  cdalton <cdalton@nvidia.com> | 2015-11-11 15:03:45 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-11-11 15:03:46 -0800 |
| commit | 24ddb0a4ddbf4b576b2c8a6fc19765e00c3bd34d (patch) | |
| tree | 7b30cd14a820fe3afc8fe24cee4a03690a0c3a3a /src/gpu/gl/GrGLGpu.cpp | |
| parent | cb8d719d7a991ceb93ccc7dd1542bb0cd82437d6 (diff) | |
Revert of Fix setColocatedSampleLocations on ES and GL < 4.5 (patchset #2 id:20001 of https://codereview.chromium.org/1415503008/ )
Reason for revert:
Co-centered sample locations are not needed to do stencil clip with mixed samples.
Original issue's description:
> Fix setColocatedSampleLocations on ES and GL < 4.5
>
> Updates setColocatedSampleLocations to use glFramebufferParameteri
> when
> the DSA version glNamedFramebufferParameteri is not present.
>
> BUG=skia:
>
> Committed:
> https://skia.googlesource.com/skia/+/98cad6219b430eddf5528473311279f21dbd2e10
BUG=skia:
Review URL: https://codereview.chromium.org/1420883007
Diffstat (limited to 'src/gpu/gl/GrGLGpu.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 72262abed3..babc96615c 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2043,17 +2043,9 @@ void GrGLGpu::setColocatedSampleLocations(GrRenderTarget* rt, bool useColocatedS return; } - if (kGL_GrGLStandard == this->glStandard() && this->glVersion() >= GR_GL_VER(4,5)) { - GL_CALL(NamedFramebufferParameteri(target->renderFBOID(), - GR_GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS, - useColocatedSampleLocations)); - } else { - GL_CALL(BindFramebuffer(GR_GL_FRAMEBUFFER, target->renderFBOID())); - GL_CALL(FramebufferParameteri(GR_GL_FRAMEBUFFER, - GR_GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS, - useColocatedSampleLocations)); - fHWBoundRenderTargetUniqueID = SK_InvalidUniqueID; - } + GL_CALL(NamedFramebufferParameteri(target->renderFBOID(), + GR_GL_FRAMEBUFFER_PROGRAMMABLE_SAMPLE_LOCATIONS, + useColocatedSampleLocations)); target->flagAsUsingColocatedSampleLocations(useColocatedSampleLocations); } |