diff options
| author |  skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 03:06:10 +0000 |
|---|---|---|
| committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-05-30 03:06:10 +0000 |
| commit | 9681eebb0e441cee25b6faac82c3728512acda27 (patch) | |
| tree | 014b1c362c6fb978095eea673424bfc1bf0003e8 /src | |
| parent | 05858435ee8744de863be7e5ade05e4fd6edfb46 (diff) | |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@14984 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLShaderBuilder.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 68bb8ff2d4..88fc02201e 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -194,9 +194,9 @@ private: SkAutoTDelete<GrGLProgramEffects> fColorEffects; SkAutoTDelete<GrGLProgramEffects> fCoverageEffects; - + GrGLProgramDesc fDesc; - + GrGpuGL* fGpu; SkAutoTUnref<GrGLUniformManager> fUniformManager; diff --git a/src/gpu/gl/GrGLShaderBuilder.cpp b/src/gpu/gl/GrGLShaderBuilder.cpp index 93364e1640..d2e49a9f6c 100644 --- a/src/gpu/gl/GrGLShaderBuilder.cpp +++ b/src/gpu/gl/GrGLShaderBuilder.cpp @@ -139,7 +139,7 @@ bool GrGLShaderBuilder::genProgram(const GrEffectStage* colorStages[], if (GrGLProgramDesc::kSecondaryCoverageISA_CoverageOutput == header.fCoverageOutput) { // Get (1-A) into coeff coeff = GrGLSLExpr4::VectorCast(GrGLSLExpr1(1) - inColor.a()); - } else if (GrGLProgramDesc::kSecondaryCoverageISC_CoverageOutput == + } else if (GrGLProgramDesc::kSecondaryCoverageISC_CoverageOutput == header.fCoverageOutput){ // Get (1-RGBA) into coeff coeff = GrGLSLExpr4(1) - inColor; |