aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/effects
diff options
context:
space:
mode:
authorGravatar Cary Clark <caryclark@google.com>2017-02-28 13:59:54 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-28 14:00:06 +0000
commit0755bb1db7c4076c68fac344484f7652356c2e1e (patch)
tree5e100a324266ca1445349e9ae76a1f8a1eaf9e23 /src/gpu/effects
parentc8f1e3a5c08d58657dddccdeedbe5d6e8c16d891 (diff)
Revert "Allow distance field path renderer to store bitmaps at low resolutions"
This reverts commit c0bc1bb8690e5ce489394112b0cf4fe4601c1f2c. Reason for revert: broke build with SkTDynamicHash error Original change's description: > Allow distance field path renderer to store bitmaps at low resolutions > > BUG=chromium:682918 > > Change-Id: I1a0608f7e6394ab05eebc4b78fb7087ca718f617 > Reviewed-on: https://skia-review.googlesource.com/8971 > Commit-Queue: Jim Van Verth <jvanverth@google.com> > Reviewed-by: Robert Phillips <robertphillips@google.com> > TBR=egdaniel@google.com,jvanverth@google.com,bsalomon@google.com,robertphillips@google.com,reviews@skia.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:682918 Change-Id: I4a3c370a248915fe7c7e77dd0346d6ab6f0d10c6 Reviewed-on: https://skia-review.googlesource.com/9063 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Cary Clark <caryclark@google.com>
Diffstat (limited to 'src/gpu/effects')
-rw-r--r--src/gpu/effects/GrDistanceFieldGeoProc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
index 1c2ef6494a..89ec238efd 100644
--- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -518,7 +518,7 @@ GrDistanceFieldPathGeoProc::GrDistanceFieldPathGeoProc(
fInPosition = &this->addVertexAttrib("inPosition", kVec2f_GrVertexAttribType,
kHigh_GrSLPrecision);
fInColor = &this->addVertexAttrib("inColor", kVec4ub_GrVertexAttribType);
- fInTextureCoords = &this->addVertexAttrib("inTextureCoords", kVec2us_GrVertexAttribType);
+ fInTextureCoords = &this->addVertexAttrib("inTextureCoords", kVec2f_GrVertexAttribType);
this->addTextureSampler(&fTextureSampler);
}
@@ -542,7 +542,7 @@ GrDistanceFieldPathGeoProc::GrDistanceFieldPathGeoProc(
fInPosition = &this->addVertexAttrib("inPosition", kVec2f_GrVertexAttribType,
kHigh_GrSLPrecision);
fInColor = &this->addVertexAttrib("inColor", kVec4ub_GrVertexAttribType);
- fInTextureCoords = &this->addVertexAttrib("inTextureCoords", kVec2us_GrVertexAttribType);
+ fInTextureCoords = &this->addVertexAttrib("inTextureCoords", kVec2f_GrVertexAttribType);
this->addTextureSampler(&fTextureSampler);
}