AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reenable GrAAHairlinePathRenderer assert w/ fix

Browse Source 
https://codereview.chromium.org/24269004/



git-svn-id: http://skia.googlecode.com/svn/trunk@11385 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-09-19 16:36:43 +00:00
parent 417446a1ce
commit 52c7526211
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gpu/GrAAHairLinePathRenderer.cpp
View File

@ -738,8 +738,6 @@ bool GrAAHairLinePathRenderer::createLineGeom(const SkPath& path,
const SkMatrix& viewM = drawState->getViewMatrix(); const SkMatrix& viewM = drawState->getViewMatrix();
devBounds->outset(SK_Scalar1, SK_Scalar1);
int vertCnt = kVertsPerLineSeg * lineCnt; int vertCnt = kVertsPerLineSeg * lineCnt;
drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs)); drawState->setVertexAttribs<gHairlineLineAttribs>(SK_ARRAY_COUNT(gHairlineLineAttribs));
@ -763,9 +761,10 @@ bool GrAAHairLinePathRenderer::createLineGeom(const SkPath& path,
for (int i = 0; i < lineCnt; ++i) { for (int i = 0; i < lineCnt; ++i) {
add_line(&lines[2*i], toSrc, drawState->getCoverage(), &verts); add_line(&lines[2*i], toSrc, drawState->getCoverage(), &verts);
} }
// All the verts computed by add_line are within unit distance of the end points. Add a little // All the verts computed by add_line are within sqrt(1^2 + 0.5^2) of the end points.
// extra to account for vector normalization precision. static const SkScalar kSqrtOfOneAndAQuarter = SkFloatToScalar(1.118f);
static const SkScalar kOutset = SK_Scalar1 + SK_Scalar1 / 20; // Add a little extra to account for vector normalization precision.
static const SkScalar kOutset = kSqrtOfOneAndAQuarter + SK_Scalar1 / 20;
devBounds->outset(kOutset, kOutset); devBounds->outset(kOutset, kOutset);
return true; return true;
@ -937,8 +936,8 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
GrDrawState* drawState = target->drawState(); GrDrawState* drawState = target->drawState();
// Check devBounds // Check devBounds
// SkASSERT(check_bounds<LineVertex>(drawState, devBounds, arg.vertices(), SkASSERT(check_bounds<LineVertex>(drawState, devBounds, arg.vertices(),
// kVertsPerLineSeg * lineCnt)); kVertsPerLineSeg * lineCnt));
{ {
GrDrawState::AutoRestoreEffects are(drawState); GrDrawState::AutoRestoreEffects are(drawState);