Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: include/gpu/GrPaint.h

Issue 543623004: Removing vertex attrib indices (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: warning fixed Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « include/gpu/GrEffectStage.h ('k') | include/gpu/GrShaderVar.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrPaint.h
diff --git a/include/gpu/GrPaint.h b/include/gpu/GrPaint.h
index 900ab4c407b878c1a7e227188ed7eb396597b363..07b526f73cf7ed44b591c4766069471596583629 100644
--- a/include/gpu/GrPaint.h
+++ b/include/gpu/GrPaint.h
@@ -87,24 +87,26 @@ public:
/**
* Appends an additional color effect to the color computation.
*/
- const GrEffect* addColorEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
+ const GrEffect* addColorEffect(const GrEffect* effect) {
SkASSERT(effect);
+ SkASSERT(!effect->requiresVertexShader());
if (!effect->willUseInputColor()) {
fColorStages.reset();
}
- SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect, attr0, attr1));
+ SkNEW_APPEND_TO_TARRAY(&fColorStages, GrEffectStage, (effect));
return effect;
}
/**
* Appends an additional coverage effect to the coverage computation.
*/
- const GrEffect* addCoverageEffect(const GrEffect* effect, int attr0 = -1, int attr1 = -1) {
+ const GrEffect* addCoverageEffect(const GrEffect* effect) {
SkASSERT(effect);
+ SkASSERT(!effect->requiresVertexShader());
if (!effect->willUseInputColor()) {
fCoverageStages.reset();
}
- SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect, attr0, attr1));
+ SkNEW_APPEND_TO_TARRAY(&fCoverageStages, GrEffectStage, (effect));
return effect;
}
« no previous file with comments | « include/gpu/GrEffectStage.h ('k') | include/gpu/GrShaderVar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698