Rename GrPaint fields/enums/members texture->color mask->coverage.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/6615046
git-svn-id: http://skia.googlecode.com/svn/trunk@5827 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/GrTextContext.cpp b/src/gpu/GrTextContext.cpp
index 109fc6b..5c8b9e5 100644
--- a/src/gpu/GrTextContext.cpp
+++ b/src/gpu/GrTextContext.cpp
@@ -40,7 +40,7 @@
if (!GrPixelConfigIsAlphaOnly(fCurrTexture->config())) {
if (kOne_GrBlendCoeff != fPaint.fSrcBlendCoeff ||
kISA_GrBlendCoeff != fPaint.fDstBlendCoeff ||
- fPaint.hasTexture()) {
+ fPaint.hasColorStage()) {
GrPrintf("LCD Text will not draw correctly.\n");
}
// setup blend so that we get mask * paintColor + (1-mask)*dstColor
@@ -121,19 +121,19 @@
*/
bool invVMComputed = false;
GrMatrix invVM;
- for (int t = 0; t < GrPaint::kMaxTextures; ++t) {
- if (fPaint.isTextureStageEnabled(t)) {
+ for (int t = 0; t < GrPaint::kMaxColorStages; ++t) {
+ if (fPaint.isColorStageEnabled(t)) {
if (invVMComputed || fOrigViewMatrix.invert(&invVM)) {
invVMComputed = true;
- fPaint.textureSampler(t)->preConcatMatrix(invVM);
+ fPaint.colorSampler(t)->preConcatMatrix(invVM);
}
}
}
- for (int m = 0; m < GrPaint::kMaxMasks; ++m) {
- if (fPaint.isMaskStageEnabled(m)) {
+ for (int m = 0; m < GrPaint::kMaxCoverageStages; ++m) {
+ if (fPaint.isCoverageStageEnabled(m)) {
if (invVMComputed || fOrigViewMatrix.invert(&invVM)) {
invVMComputed = true;
- fPaint.maskSampler(m)->preConcatMatrix(invVM);
+ fPaint.coverageSampler(m)->preConcatMatrix(invVM);
}
}
}