diff options
| -rwxr-xr-x | gm/ovals.cpp | 28 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgram.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLSL.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLSL_impl.h | 14 |
4 files changed, 24 insertions, 24 deletions
diff --git a/gm/ovals.cpp b/gm/ovals.cpp index b5a12e7328..ae727b9ef3 100755 --- a/gm/ovals.cpp +++ b/gm/ovals.cpp @@ -152,17 +152,17 @@ protected: rectPaint.setColor(SK_ColorLTGRAY); int testCount = 0; - for (int i = 0; i < fPaints.count(); ++i) { + for (int i = 0; i < fPaints.count(); ++i) { for (int j = 0; j < fMatrices.count(); ++j) { canvas->save(); SkMatrix mat = fMatrices[j]; // position the oval, and make it at off-integer coords. - mat.postTranslate(kXStart + SK_Scalar1 * kXStep * (testCount % maxX) + + mat.postTranslate(kXStart + SK_Scalar1 * kXStep * (testCount % maxX) + SK_Scalar1 / 4, - kYStart + SK_Scalar1 * kYStep * (testCount / maxX) + + kYStart + SK_Scalar1 * kYStep * (testCount / maxX) + 3 * SK_Scalar1 / 4); canvas->concat(mat); - + SkColor color = genColor(&rand); fPaints[i].setColor(color); @@ -178,13 +178,13 @@ protected: // special cases // non-scaled tall and skinny oval - for (int i = 0; i < fPaints.count(); ++i) { + for (int i = 0; i < fPaints.count(); ++i) { SkRect oval = SkRect::MakeLTRB(-20, -60, 20, 60); canvas->save(); // position the oval, and make it at off-integer coords. canvas->translate(kXStart + SK_Scalar1 * kXStep * 2.55f + SK_Scalar1 / 4, kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4); - + SkColor color = genColor(&rand); fPaints[i].setColor(color); @@ -194,14 +194,14 @@ protected: } // non-scaled wide and short oval - for (int i = 0; i < fPaints.count(); ++i) { + for (int i = 0; i < fPaints.count(); ++i) { SkRect oval = SkRect::MakeLTRB(-80, -30, 80, 30); canvas->save(); // position the oval, and make it at off-integer coords. canvas->translate(kXStart + SK_Scalar1 * kXStep * 4 + SK_Scalar1 / 4, kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 + SK_ScalarHalf * kYStep); - + SkColor color = genColor(&rand); fPaints[i].setColor(color); @@ -211,13 +211,13 @@ protected: } // super skinny oval - for (int i = 0; i < fPaints.count(); ++i) { + for (int i = 0; i < fPaints.count(); ++i) { SkRect oval = SkRect::MakeLTRB(0, -60, 1, 60); canvas->save(); // position the oval, and make it at off-integer coords. canvas->translate(kXStart + SK_Scalar1 * kXStep * 3.25f + SK_Scalar1 / 4, kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4); - + SkColor color = genColor(&rand); fPaints[i].setColor(color); @@ -226,14 +226,14 @@ protected: } // super short oval - for (int i = 0; i < fPaints.count(); ++i) { + for (int i = 0; i < fPaints.count(); ++i) { SkRect oval = SkRect::MakeLTRB(-80, -1, 80, 0); canvas->save(); // position the oval, and make it at off-integer coords. canvas->translate(kXStart + SK_Scalar1 * kXStep * 2.5f + SK_Scalar1 / 4, kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 + SK_ScalarHalf * kYStep); - + SkColor color = genColor(&rand); fPaints[i].setColor(color); @@ -252,13 +252,13 @@ protected: SK_ARRAY_COUNT(colors), SkShader::kClamp_TileMode)); - for (int i = 0; i < fPaints.count(); ++i) { + for (int i = 0; i < fPaints.count(); ++i) { canvas->save(); // position the path, and make it at off-integer coords. canvas->translate(kXStart + SK_Scalar1 * kXStep * 0 + SK_Scalar1 / 4, kYStart + SK_Scalar1 * kYStep * i + 3 * SK_Scalar1 / 4 + SK_ScalarHalf * kYStep); - + SkColor color = genColor(&rand); fPaints[i].setColor(color); fPaints[i].setShader(shader); diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp index f1280eaf84..0b338f2faa 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/gl/GrGLProgram.cpp @@ -526,7 +526,7 @@ bool GrGLProgram::genProgram(const GrEffectStage* stages[]) { // incoming coverage to current stage being processed. SkString inCoverage; GrSLConstantVec knownCoverageValue = this->genInputCoverage(&builder, &inCoverage); - + SkString outCoverage; for (int s = fDesc.fFirstCoverageStage; s < GrDrawState::kNumStages; ++s) { if (fDesc.fEffectKeys[s]) { diff --git a/src/gpu/gl/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp index ff6b463803..dcaa85e83e 100644 --- a/src/gpu/gl/GrGLSL.cpp +++ b/src/gpu/gl/GrGLSL.cpp @@ -104,11 +104,11 @@ GrSLConstantVec GrGLSLMulVarBy4f(SkString* outAppend, const char* mulFactor, GrSLConstantVec mulFactorDefault) { bool haveFactor = NULL != mulFactor && '\0' != *mulFactor; - + GrAssert(NULL != outAppend); GrAssert(NULL != vec4VarName); GrAssert(kNone_GrSLConstantVec != mulFactorDefault || haveFactor); - + if (!haveFactor) { if (kOnes_GrSLConstantVec == mulFactorDefault) { return kNone_GrSLConstantVec; diff --git a/src/gpu/gl/GrGLSL_impl.h b/src/gpu/gl/GrGLSL_impl.h index a60057bc0c..0dc0d8f402 100644 --- a/src/gpu/gl/GrGLSL_impl.h +++ b/src/gpu/gl/GrGLSL_impl.h @@ -34,13 +34,13 @@ GrSLConstantVec GrGLSLModulatef(SkString* outAppend, bool omitIfConstVec) { GrAssert(N > 0 && N <= 4); GrAssert(NULL != outAppend); - + bool has0 = NULL != in0 && '\0' != *in0; bool has1 = NULL != in1 && '\0' != *in1; - + GrAssert(has0 || kNone_GrSLConstantVec != default0); GrAssert(has1 || kNone_GrSLConstantVec != default1); - + if (!has0 && !has1) { GrAssert(kZeros_GrSLConstantVec == default0 || kOnes_GrSLConstantVec == default0); GrAssert(kZeros_GrSLConstantVec == default1 || kOnes_GrSLConstantVec == default1); @@ -81,10 +81,10 @@ GrSLConstantVec GrGLSLAddf(SkString* outAppend, bool omitIfConstVec) { GrAssert(N > 0 && N <= 4); GrAssert(NULL != outAppend); - + bool has0 = NULL != in0 && '\0' != *in0; bool has1 = NULL != in1 && '\0' != *in1; - + if (!has0 && !has1) { GrAssert(kNone_GrSLConstantVec != default0); GrAssert(kNone_GrSLConstantVec != default1); @@ -140,10 +140,10 @@ GrSLConstantVec GrGLSLSubtractf(SkString* outAppend, bool omitIfConstVec) { GrAssert(N > 0 && N <= 4); GrAssert(NULL != outAppend); - + bool has0 = NULL != in0 && '\0' != *in0; bool has1 = NULL != in1 && '\0' != *in1; - + if (!has0 && !has1) { GrAssert(kNone_GrSLConstantVec != default0); GrAssert(kNone_GrSLConstantVec != default1); |