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

Unified Diff: tests/GLProgramsTest.cpp

Issue 13069003: Replace edge types with GrEdgeEffect. (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 7 years, 9 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
« src/gpu/effects/GrEdgeEffect.cpp ('K') | « src/gpu/gl/GrGLProgram.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/GLProgramsTest.cpp
===================================================================
--- tests/GLProgramsTest.cpp (revision 8387)
+++ tests/GLProgramsTest.cpp (working copy)
@@ -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;
« src/gpu/effects/GrEdgeEffect.cpp ('K') | « src/gpu/gl/GrGLProgram.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698