diff options
Diffstat (limited to 'src/gpu')
| -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 |
3 files changed, 10 insertions, 10 deletions
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); |