aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'src/gpu')
-rw-r--r--src/gpu/GrContext.cpp4
-rw-r--r--src/gpu/GrDrawState.cpp6
-rw-r--r--src/gpu/GrDrawState.h8
-rw-r--r--src/gpu/GrTextContext.cpp4
-rw-r--r--src/gpu/effects/GrEllipseEdgeEffect.cpp4
-rw-r--r--src/gpu/gl/GrGLProgram.cpp2
-rw-r--r--src/gpu/gl/GrGLShaderBuilder.cpp4
-rw-r--r--src/gpu/gl/GrGpuGL_program.cpp2
8 files changed, 17 insertions, 17 deletions
diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 7c852124e8..271923aedf 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -1131,8 +1131,8 @@ void GrContext::internalDrawOval(const GrPaint& paint,
drawState->setAttribBindings(GrDrawState::kDefault_AttribBindings);
enum {
- // the edge effects share this stage with glyph rendering
- // (kGlyphMaskStage in GrTextContext) && SW path rendering
+ // the edge effects share this stage with glyph rendering
+ // (kGlyphMaskStage in GrTextContext) && SW path rendering
// (kPathMaskStage in GrSWMaskHelper)
kEdgeEffectStage = GrPaint::kTotalStages,
};
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index fddce41099..cd5fe1c0d6 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -142,7 +142,7 @@ bool GrDrawState::validateVertexAttribs() const {
}
// sentinel to make sure effects don't try to use built-in attributes
- static const int kBuiltInAttributeType = 10000;
+ static const int kBuiltInAttributeType = 10000;
// check our built-in indices
if (fAttribIndices[kPosition_AttribIndex] >= kVertexAttribCnt) {
@@ -177,7 +177,7 @@ bool GrDrawState::validateVertexAttribs() const {
}
// now those set by effects
- for (int s = 0; s < kNumStages; ++s) {
+ for (int s = 0; s < kNumStages; ++s) {
const GrEffectStage& stage = fStages[s];
const GrEffectRef* effect = stage.getEffect();
if (effect == NULL) {
@@ -199,7 +199,7 @@ bool GrDrawState::validateVertexAttribs() const {
}
GrSLType attributeType = effect->get()->vertexAttribType(i);
- if (attributeTypes[attributeIndex] != -1 &&
+ if (attributeTypes[attributeIndex] != -1 &&
attributeTypes[attributeIndex] != attributeType) {
return false;
}
diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 220e290a83..4e9747d755 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -334,7 +334,7 @@ public:
bool hasSolidCoverage(GrAttribBindings) const;
static void VertexAttributesUnitTest();
-
+
/// @}
///////////////////////////////////////////////////////////////////////////
@@ -485,7 +485,7 @@ public:
/// @name Effect Stages
////
- const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect,
+ const GrEffectRef* setEffect(int stageIdx, const GrEffectRef* effect,
const int* indices = NULL) {
fStages[stageIdx].setEffect(effect, indices);
return effect;
@@ -517,8 +517,8 @@ public:
return true;
}
- void disableStage(int stageIdx) {
- this->setEffect(stageIdx, NULL, NULL);
+ void disableStage(int stageIdx) {
+ this->setEffect(stageIdx, NULL, NULL);
}
/**
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index a8defcb4ba..5ff13b0fdc 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -19,8 +19,8 @@
#include "SkStrokeRec.h"
enum {
- // glyph rendering shares this stage with edge rendering
- // (kEdgeEffectStage in GrContext) && SW path rendering
+ // glyph rendering shares this stage with edge rendering
+ // (kEdgeEffectStage in GrContext) && SW path rendering
// (kPathMaskStage in GrSWMaskHelper)
kGlyphMaskStage = GrPaint::kTotalStages,
};
diff --git a/src/gpu/effects/GrEllipseEdgeEffect.cpp b/src/gpu/effects/GrEllipseEdgeEffect.cpp
index 002753e203..18301e9999 100644
--- a/src/gpu/effects/GrEllipseEdgeEffect.cpp
+++ b/src/gpu/effects/GrEllipseEdgeEffect.cpp
@@ -30,12 +30,12 @@ public:
const SkString* attrName = builder->getEffectAttributeName(stage.getVertexAttribIndices()[0]);
builder->vsCodeAppendf("\t%s = %s;\n", vsName, attrName->c_str());
-
+
builder->fsCodeAppend("\tfloat edgeAlpha;\n");
// translate to origin
builder->fsCodeAppendf("\tvec2 offset = (%s.xy - %s.xy);\n", builder->fragmentPosition(), fsName);
// scale y by xRadius/yRadius
- builder->fsCodeAppendf("\toffset.y *= %s.w;\n", fsName);
+ builder->fsCodeAppendf("\toffset.y *= %s.w;\n", fsName);
builder->fsCodeAppend("\tfloat d = length(offset);\n");
// compare length against xRadius
builder->fsCodeAppendf("\tedgeAlpha = smoothstep(d - 0.5, d + 0.5, %s.z);\n", fsName);
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index c1643578ad..850f0bb134 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -1013,7 +1013,7 @@ bool GrGLProgram::bindOutputsAttribsAndLinkProgram(const GrGLShaderBuilder& buil
}
const GrGLShaderBuilder::AttributePair* attribEnd = builder.getEffectAttributes().end();
- for (const GrGLShaderBuilder::AttributePair* attrib = builder.getEffectAttributes().begin();
+ for (const GrGLShaderBuilder::AttributePair* attrib = builder.getEffectAttributes().begin();
attrib != attribEnd;
++attrib) {
GL_CALL(BindAttribLocation(fProgramID, attrib->fIndex, attrib->fName.c_str()));
diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp
index 1a238ae04b..b3b09cc477 100644
--- a/src/gpu/gl/GrGLShaderBuilder.cpp
+++ b/src/gpu/gl/GrGLShaderBuilder.cpp
@@ -539,13 +539,13 @@ GrGLEffect* GrGLShaderBuilder::createAndEmitGLEffect(
const SkString* GrGLShaderBuilder::getEffectAttributeName(int attributeIndex) const {
const AttributePair* attribEnd = this->getEffectAttributes().end();
- for (const AttributePair* attrib = this->getEffectAttributes().begin();
+ for (const AttributePair* attrib = this->getEffectAttributes().begin();
attrib != attribEnd;
++attrib) {
if (attrib->fIndex == attributeIndex) {
return &attrib->fName;
}
- }
+ }
return NULL;
}
diff --git a/src/gpu/gl/GrGpuGL_program.cpp b/src/gpu/gl/GrGpuGL_program.cpp
index a717b8650b..5081089216 100644
--- a/src/gpu/gl/GrGpuGL_program.cpp
+++ b/src/gpu/gl/GrGpuGL_program.cpp
@@ -19,7 +19,7 @@ static const UniformHandle kInvalidUniformHandle = GrGLUniformManager::kInvalidU
GrGpuGL::ProgramCache::ProgramCache(const GrGLContext& gl)
: fCount(0)
, fCurrLRUStamp(0)
- , fGL(gl)
+ , fGL(gl)
#ifdef PROGRAM_CACHE_STATS
, fTotalRequests(0)
, fCacheMisses(0)
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 05:25:33 +0000