aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGLCaps.h
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-05-31 15:59:40 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-31 16:22:03 +0000
commitfdd117025fb846771e9e47cbf825d9071745fa98 (patch)
treec261dcfd2f3fd40a0c9a264d76c2d8f52f985bdc /src/gpu/gl/GrGLCaps.h
parent9c6645e787669e5af2b9de73d0a6d1cd4d77bbf0 (diff)
Revert "Expand partial render target write pixels workaround."
This reverts commit 0cc507d22566bb7e28e5fe21e4b3fc7b682d86a2. Reason for revert: Causing IntTextureText to fail on bots Original change's description: > Expand partial render target write pixels workaround. > > The workaround is extended in the following ways: > > 1) It now applies to any texture whose base level has *ever* been attached to a FBO. > 2) It applies to Adreno 5xx in addition to Adreno 4xx > 3) It applies in the atlas upload code path. > > This workaround (and a similar one) are narrowed to GLCaps rather than Caps. > > Bug: skia: > Change-Id: Id600e9739bb97bf6766075ea2a987fd2039e53e5 > Reviewed-on: https://skia-review.googlesource.com/18150 > Reviewed-by: Robert Phillips <robertphillips@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> > TBR=bsalomon@google.com,robertphillips@google.com No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Change-Id: I53c8dd7ea7f614da57331470fcc24c6d84aba354 Reviewed-on: https://skia-review.googlesource.com/18229 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/gl/GrGLCaps.h')
-rw-r--r--src/gpu/gl/GrGLCaps.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 75a12d7762..b7273a08b1 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -368,18 +368,6 @@ public:
// https://bugs.chromium.org/p/skia/issues/detail?id=6650
bool drawArraysBaseVertexIsBroken() const { return fDrawArraysBaseVertexIsBroken; }
- // If true then we must use an intermediate surface to perform partial updates to a texture that
- // has ever been bound to a FBO.
- bool disallowTexSubImageForTexturesEverBoundToFBO() const {
- return fDisallowTexSubImageForTexturesEverBoundToFBO;
- }
-
- // Use an intermediate surface to write pixels (full or partial overwrite) to into a texture
- // that is bound to an FBO.
- bool useDrawInsteadOfAllRenderTargetWrites() const {
- return fUseDrawInsteadOfAllRenderTargetWrites;
- }
-
bool initDescForDstCopy(const GrRenderTargetProxy* src, GrSurfaceDesc* desc,
bool* rectsMustMatch, bool* disallowSubrect) const override;
@@ -454,8 +442,6 @@ private:
bool fClearToBoundaryValuesIsBroken : 1;
bool fClearTextureSupport : 1;
bool fDrawArraysBaseVertexIsBroken : 1;
- bool fDisallowTexSubImageForTexturesEverBoundToFBO : 1;
- bool fUseDrawInsteadOfAllRenderTargetWrites : 1;
uint32_t fBlitFramebufferFlags;