aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
authorGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-27 07:01:04 +0000
committerGravatar skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-03-27 07:01:04 +0000
commit37cbc7fd014e3b35833523dbdbe3bc3ac52ecacd (patch)
tree87b6d781bcd0b8254efb1b52e2e452f07afbc3df /src/gpu
parent48552314f6d101f3fd094d5f2fd6f70fe9aad841 (diff)
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8404 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrAAHairLinePathRenderer.cpp2
-rw-r--r--src/gpu/effects/GrEdgeEffect.cpp2
-rw-r--r--src/gpu/effects/GrEdgeEffect.h4
-rw-r--r--src/gpu/gl/GrGLProgram.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrAAHairLinePathRenderer.cpp b/src/gpu/GrAAHairLinePathRenderer.cpp
index 079c826e4e..9e24bed338 100644
--- a/src/gpu/GrAAHairLinePathRenderer.cpp
+++ b/src/gpu/GrAAHairLinePathRenderer.cpp
@@ -615,7 +615,7 @@ bool GrAAHairLinePathRenderer::onDrawPath(const SkPath& path,
GrEffectRef* hairLineEffect = GrEdgeEffect::Create(GrEdgeEffect::kHairLine_EdgeType);
GrEffectRef* hairQuadEffect = GrEdgeEffect::Create(GrEdgeEffect::kHairQuad_EdgeType);
-
+
target->setIndexSourceToBuffer(fLinesIndexBuffer);
int lines = 0;
int nBufLines = fLinesIndexBuffer->maxQuads();
diff --git a/src/gpu/effects/GrEdgeEffect.cpp b/src/gpu/effects/GrEdgeEffect.cpp
index f02fa35ae0..dd7474fd00 100644
--- a/src/gpu/effects/GrEdgeEffect.cpp
+++ b/src/gpu/effects/GrEdgeEffect.cpp
@@ -52,7 +52,7 @@ public:
builder->fsCodeAppendf("\t\t\tvec2 gF = vec2(2.0*%s.x*duvdx.x - duvdx.y,\n"
"\t\t\t 2.0*%s.x*duvdy.x - duvdy.y);\n",
fsName, fsName);
- builder->fsCodeAppendf("\t\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
+ builder->fsCodeAppendf("\t\t\tedgeAlpha = (%s.x*%s.x - %s.y);\n", fsName, fsName,
fsName);
builder->fsCodeAppendf("\t\t\tedgeAlpha = "
"clamp(0.5 - edgeAlpha / length(gF), 0.0, 1.0);\n\t\t}\n");
diff --git a/src/gpu/effects/GrEdgeEffect.h b/src/gpu/effects/GrEdgeEffect.h
index c6238a2e09..5bbe05f623 100644
--- a/src/gpu/effects/GrEdgeEffect.h
+++ b/src/gpu/effects/GrEdgeEffect.h
@@ -13,7 +13,7 @@
class GrGLEdgeEffect;
/**
- * The output of this effect is one of three different edge types: hairlines, quads,
+ * The output of this effect is one of three different edge types: hairlines, quads,
* and hairline quads.
*/
@@ -50,7 +50,7 @@ public:
static SkAutoTUnref<GrEffectRef> gUnref0(gEdgeEffectRef[0]);
static SkAutoTUnref<GrEffectRef> gUnref1(gEdgeEffectRef[1]);
static SkAutoTUnref<GrEffectRef> gUnref2(gEdgeEffectRef[2]);
-
+
gEdgeEffectRef[type]->ref();
return gEdgeEffectRef[type];
}
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 1c8f884afc..5f567912f6 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -163,13 +163,13 @@ void GrGLProgram::BuildDesc(const GrDrawState& drawState,
hasCoverage = requiresAttributeCoverage;
}
}
-
+
if (hasCoverage) {
// color filter is applied between color/coverage computation
if (SkXfermode::kDst_Mode != desc->fColorFilterXfermode) {
desc->fFirstCoverageStage = firstCoverageStage;
}
-
+
// If we're stenciling then we want to discard samples that have zero coverage
if (drawState.getStencil().doesWrite()) {
desc->fDiscardIfZeroCoverage = true;