Replace edge types with GrEdgeEffect.
This strips out last of the edge types and the fixed function edge attribute and replaces them with using GrEdgeEffect. Also fixes a minor bug when checking attribute counts -- it was using kAttribIndexCount instead of kVertexAttribCnt.
Original Author: jvanverth@google.com
Review URL: https://codereview.chromium.org/13069003
git-svn-id: http://skia.googlecode.com/svn/trunk@8392 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp
index 1270b93..50ba9c3 100644
--- a/tests/GLProgramsTest.cpp
+++ b/tests/GLProgramsTest.cpp
@@ -39,17 +39,10 @@
fExperimentalGS = gpu->caps()->geometryShaderSupport() && random->nextBool();
#endif
- bool edgeAA = random->nextBool();
- if (edgeAA) {
- fAttribBindings |= GrDrawState::kEdge_AttribBindingsBit;
- if (gpu->caps()->shaderDerivativeSupport()) {
- fVertexEdgeType = (GrDrawState::VertexEdgeType)
- random->nextULessThan(GrDrawState::kVertexEdgeTypeCnt);
- fDiscardIfOutsideEdge = random->nextBool();
- } else {
- fVertexEdgeType = GrDrawState::kHairLine_EdgeType;
- fDiscardIfOutsideEdge = false;
- }
+ if (gpu->caps()->shaderDerivativeSupport()) {
+ fDiscardIfOutsideEdge = random->nextBool();
+ } else {
+ fDiscardIfOutsideEdge = false;
}
if (gpu->caps()->dualSourceBlendingSupport()) {
@@ -84,10 +77,6 @@
fCoverageAttributeIndex = attributeIndex;
++attributeIndex;
}
- if (fAttribBindings & GrDrawState::kEdge_AttribBindingsBit) {
- fEdgeAttributeIndex = attributeIndex;
- ++attributeIndex;
- }
if (fAttribBindings & GrDrawState::kLocalCoords_AttribBindingsBit) {
fLocalCoordsAttributeIndex = attributeIndex;
++attributeIndex;