diff options
Diffstat (limited to 'src/gpu')
| -rw-r--r-- | src/gpu/GrDrawState.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/GrDrawState.h | 2 | ||||
| -rw-r--r-- | src/gpu/GrDrawTarget.cpp | 6 | ||||
| -rw-r--r-- | src/gpu/GrDrawTarget.h | 2 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 4 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLProgramDesc.h | 10 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/gpu/GrDrawState.cpp b/src/gpu/GrDrawState.cpp index aa9e692f6c..21bff8b668 100644 --- a/src/gpu/GrDrawState.cpp +++ b/src/gpu/GrDrawState.cpp @@ -146,7 +146,7 @@ bool GrDrawState::validateVertexAttribs() const { int slVecCount = GrSLTypeVectorCount(effectSLType); int attribVecCount = GrVertexAttribTypeVectorCount(attribType); if (slVecCount != attribVecCount || - (static_cast<GrSLType>(-1) != slTypes[attribIndex] && + (static_cast<GrSLType>(-1) != slTypes[attribIndex] && slTypes[attribIndex] != effectSLType)) { return false; } diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h index 3ed9fea26c..024dfd0327 100644 --- a/src/gpu/GrDrawState.h +++ b/src/gpu/GrDrawState.h @@ -423,7 +423,7 @@ public: } } } - + /** * Checks whether any of the effects will read the dst pixel color. */ diff --git a/src/gpu/GrDrawTarget.cpp b/src/gpu/GrDrawTarget.cpp index ea7787153f..e9f5be56e1 100644 --- a/src/gpu/GrDrawTarget.cpp +++ b/src/gpu/GrDrawTarget.cpp @@ -435,7 +435,7 @@ bool GrDrawTarget::setupDstReadIfNecessary(DrawInfo* info) { //GrPrintf("No dev bounds when dst copy is made.\n"); #endif } - + GrDrawTarget::AutoGeometryAndStatePush agasp(this, kReset_ASRInit); // The draw will resolve dst if it has MSAA. Two things to consider in the future: @@ -462,12 +462,12 @@ bool GrDrawTarget::setupDstReadIfNecessary(DrawInfo* info) { SkMatrix matrix; matrix.setIDiv(rt->width(), rt->height()); this->drawState()->createTextureEffect(kTextureStage, rt->asTexture(), matrix); - + SkRect srcRect = SkRect::MakeFromIRect(copyRect); SkRect dstRect = SkRect::MakeWH(SkIntToScalar(copyRect.width()), SkIntToScalar(copyRect.height())); this->drawRect(dstRect, NULL, &srcRect, NULL); - + info->fDstCopy.setTexture(ast.texture()); info->fDstCopy.setOffset(copyRect.fLeft, copyRect.fTop); return true; diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h index df3f31bbc8..e4394e6be3 100644 --- a/src/gpu/GrDrawTarget.h +++ b/src/gpu/GrDrawTarget.h @@ -654,7 +654,7 @@ protected: fDevBounds = &fDevBoundsStorage; } const SkRect* getDevBounds() const { return fDevBounds; } - + bool getDevIBounds(SkIRect* bounds) const { if (NULL != fDevBounds) { fDevBounds->roundOut(bounds); diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 4b5dfea69d..4221d73397 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -61,8 +61,8 @@ public: /** * Some GL state that is relevant to programs is not stored per-program. In particular color - * and coverage attributes can be global state. This struct is read and updated by - * GrGLProgram::setColor and GrGLProgram::setCoverage to allow us to avoid setting this state + * and coverage attributes can be global state. This struct is read and updated by + * GrGLProgram::setColor and GrGLProgram::setCoverage to allow us to avoid setting this state * redundantly. */ struct SharedGLState { diff --git a/src/gpu/gl/GrGLProgramDesc.h b/src/gpu/gl/GrGLProgramDesc.h index a77ed71665..d2167c758b 100644 --- a/src/gpu/gl/GrGLProgramDesc.h +++ b/src/gpu/gl/GrGLProgramDesc.h @@ -80,11 +80,11 @@ private: /** Non-zero if this stage has an effect */ GrGLEffect::EffectKey fEffectKeys[GrDrawState::kNumStages]; - // To enable experimental geometry shader code (not for use in - // production) -#if GR_GL_EXPERIMENTAL_GS - bool fExperimentalGS; -#endif + // To enable experimental geometry shader code (not for use in + // production) +#if GR_GL_EXPERIMENTAL_GS + bool fExperimentalGS; +#endif GrGLShaderBuilder::DstReadKey fDstRead; // set by GrGLShaderBuilder if there // are effects that must read the dst. |