Revert r7901 & r7899 to allow DEPS roll
git-svn-id: http://skia.googlecode.com/svn/trunk@7909 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index cde918b..a2958e7 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -79,6 +79,17 @@
GrGLuint programID() const { return fProgramID; }
/**
+ * Attribute indices. These should not overlap.
+ */
+ enum {
+ kPositionAttributeIndex = 0,
+ kColorAttributeIndex = 1,
+ kCoverageAttributeIndex = 2,
+ kEdgeAttributeIndex = 3,
+ kTexCoordAttributeIndex = 4,
+ };
+
+ /**
* Some GL state that is relevant to programs is not stored per-program. In particular vertex
* attributes are global state. This struct is read and updated by GrGLProgram::setData to
* allow us to avoid setting this state redundantly.
@@ -171,7 +182,7 @@
bool fDiscardIfOutsideEdge;
// stripped of bits that don't affect program generation
- GrAttribBindings fAttribBindings;
+ GrVertexLayout fVertexLayout;
/** Non-zero if this stage has an effect */
GrGLEffect::EffectKey fEffectKeys[GrDrawState::kNumStages];
@@ -188,23 +199,9 @@
SkBool8 fEmitsPointSize;
uint8_t fColorFilterXfermode; // casts to enum SkXfermode::Mode
- int8_t fPositionAttributeIndex;
- int8_t fColorAttributeIndex;
- int8_t fCoverageAttributeIndex;
- int8_t fEdgeAttributeIndex;
- int8_t fTexCoordAttributeIndex;
-
friend class GrGLProgram;
};
- // Layout information for OpenGL vertex attributes
- struct AttribLayout {
- GrGLint fCount;
- GrGLenum fType;
- GrGLboolean fNormalized;
- };
- static const AttribLayout kAttribLayouts[kGrVertexAttribTypeCount];
-
private:
GrGLProgram(const GrGLContext& gl,
const Desc& desc,