diff options
author | 2014-03-26 18:21:55 +0000 | |
---|---|---|
committer | 2014-03-26 18:21:55 +0000 | |
commit | 66beaf0a7386a1281dc63632a740d20a725358f9 (patch) | |
tree | c43497cd9510433e1a9ef81ad775536f0f97c426 /src/gpu/gl/GrGLCaps.cpp | |
parent | 8fe2ee1cf380ee8972c846f74fabd81b34665053 (diff) |
Revert of Distance field fixes for Android (https://codereview.chromium.org/205343008/)
Reason for revert:
compile error at line 110 in GrDistanceFieldTextureEffect.cpp
Original issue's description:
> Distance field fixes for Android
> - Expand glyph size by 2 on each side to compensate for bilerp lookup
> - Correct for Adreno tendency to drop entire tile if any pixel has divide-by-0
> - Fix blurriness on Adreno by using uv coords to compute gradient instead
> of st coords
> - Add faster version for uniform scale
>
> BUG=skia:2173
>
> Committed: http://code.google.com/p/skia/source/detail?r=13955
R=bsalomon@google.com
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:2173
Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/212953008
git-svn-id: http://skia.googlecode.com/svn/trunk@13956 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGLCaps.cpp')
-rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 47f3f0f0c8..a60230a2fe 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/gl/GrGLCaps.cpp @@ -47,7 +47,6 @@ void GrGLCaps::reset() { fFixedFunctionSupport = false; fDiscardFBSupport = false; fFullClearIsFree = false; - fDropsTileOnZeroDivide = false; } GrGLCaps::GrGLCaps(const GrGLCaps& caps) : GrDrawTargetCaps() { @@ -85,7 +84,6 @@ GrGLCaps& GrGLCaps::operator = (const GrGLCaps& caps) { fFixedFunctionSupport = caps.fFixedFunctionSupport; fDiscardFBSupport = caps.fDiscardFBSupport; fFullClearIsFree = caps.fFullClearIsFree; - fDropsTileOnZeroDivide = caps.fDropsTileOnZeroDivide; return *this; } @@ -246,9 +244,6 @@ void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) { } } - // Adreno GPUs have a tendency to drop tiles when there is a divide-by-zero in a shader - fDropsTileOnZeroDivide = kQualcomm_GrGLVendor == ctxInfo.vendor(); - this->initFSAASupport(ctxInfo, gli); this->initStencilFormats(ctxInfo); @@ -666,6 +661,5 @@ SkString GrGLCaps::dump() const { (fUseNonVBOVertexAndIndexDynamicData ? "YES" : "NO")); r.appendf("Discard FrameBuffer support: %s\n", (fDiscardFBSupport ? "YES" : "NO")); r.appendf("Full screen clear is free: %s\n", (fFullClearIsFree ? "YES" : "NO")); - r.appendf("Drops tile on zero divide: %s\n", (fDropsTileOnZeroDivide ? "YES" : "NO")); return r; } |