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/GrDrawState.cpp b/src/gpu/GrDrawState.cpp
index 2d2dc1a..bd6e268 100644
--- a/src/gpu/GrDrawState.cpp
+++ b/src/gpu/GrDrawState.cpp
@@ -10,19 +10,19 @@
#include "GrPaint.h"
void GrDrawState::setFromPaint(const GrPaint& paint) {
- for (int i = 0; i < GrPaint::kMaxTextures; ++i) {
- int s = i + GrPaint::kFirstTextureStage;
- if (paint.isTextureStageEnabled(i)) {
- *this->sampler(s) = paint.getTextureSampler(i);
+ for (int i = 0; i < GrPaint::kMaxColorStages; ++i) {
+ int s = i + GrPaint::kFirstColorStage;
+ if (paint.isColorStageEnabled(i)) {
+ *this->sampler(s) = paint.getColorSampler(i);
}
}
- this->setFirstCoverageStage(GrPaint::kFirstMaskStage);
+ this->setFirstCoverageStage(GrPaint::kFirstCoverageStage);
- for (int i = 0; i < GrPaint::kMaxMasks; ++i) {
- int s = i + GrPaint::kFirstMaskStage;
- if (paint.isMaskStageEnabled(i)) {
- *this->sampler(s) = paint.getMaskSampler(i);
+ for (int i = 0; i < GrPaint::kMaxCoverageStages; ++i) {
+ int s = i + GrPaint::kFirstCoverageStage;
+ if (paint.isCoverageStageEnabled(i)) {
+ *this->sampler(s) = paint.getCoverageSampler(i);
}
}