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

Unified Diff: include/gpu/GrEffectStage.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/GrEffect.h ('k') | include/gpu/GrPaint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/GrEffectStage.h
diff --git a/include/gpu/GrEffectStage.h b/include/gpu/GrEffectStage.h
index 44997901a4e050dbb250afbe1a597b3777cfb52e..6df7f90d6334a6d965151d36fa6e4f492c1347fc 100644
--- a/include/gpu/GrEffectStage.h
+++ b/include/gpu/GrEffectStage.h
@@ -24,11 +24,9 @@
// when draws are enqueued in the GrInOrderDrawBuffer.
class GrEffectStage {
public:
- explicit GrEffectStage(const GrEffect* effect, int attrIndex0 = -1, int attrIndex1 = -1)
+ explicit GrEffectStage(const GrEffect* effect)
: fEffect(SkRef(effect)) {
fCoordChangeMatrixSet = false;
- fVertexAttribIndices[0] = attrIndex0;
- fVertexAttribIndices[1] = attrIndex1;
}
GrEffectStage(const GrEffectStage& other) {
@@ -37,7 +35,6 @@ public:
fCoordChangeMatrix = other.fCoordChangeMatrix;
}
fEffect.initAndRef(other.fEffect);
- memcpy(fVertexAttribIndices, other.fVertexAttribIndices, sizeof(fVertexAttribIndices));
}
static bool AreCompatible(const GrEffectStage& a, const GrEffectStage& b,
@@ -133,16 +130,12 @@ public:
const GrEffect* getEffect() const { return fEffect.get(); }
- const int* getVertexAttribIndices() const { return fVertexAttribIndices; }
- int getVertexAttribIndexCount() const { return fEffect->numVertexAttribs(); }
-
void convertToPendingExec() { fEffect.convertToPendingExec(); }
private:
bool fCoordChangeMatrixSet;
SkMatrix fCoordChangeMatrix;
GrProgramElementRef<const GrEffect> fEffect;
- int fVertexAttribIndices[2];
};
#endif
« no previous file with comments | « include/gpu/GrEffect.h ('k') | include/gpu/GrPaint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698