Remove tesselated path renderer and supporting code, glu, and libtess target
Review URL: http://codereview.appspot.com/6197075/
git-svn-id: http://skia.googlecode.com/svn/trunk@3912 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/gpu/gl/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index 48ec623..49aa87c 100644
--- a/src/gpu/gl/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -221,21 +221,13 @@
bool edgeAA = random_bool(&random);
if (edgeAA) {
- bool vertexEdgeAA = random_bool(&random);
- if (vertexEdgeAA) {
- pdesc.fVertexLayout |= GrDrawTarget::kEdge_VertexLayoutBit;
- if (this->getCaps().fShaderDerivativeSupport) {
- pdesc.fVertexEdgeType = (GrDrawState::VertexEdgeType) random_int(&random, GrDrawState::kVertexEdgeTypeCnt);
- } else {
- pdesc.fVertexEdgeType = GrDrawState::kHairLine_EdgeType;
- }
- pdesc.fEdgeAANumEdges = 0;
+ pdesc.fVertexLayout |= GrDrawTarget::kEdge_VertexLayoutBit;
+ if (this->getCaps().fShaderDerivativeSupport) {
+ pdesc.fVertexEdgeType = (GrDrawState::VertexEdgeType) random_int(&random, GrDrawState::kVertexEdgeTypeCnt);
} else {
- pdesc.fEdgeAANumEdges = random_int(&random, 1, this->getMaxEdges());
- pdesc.fEdgeAAConcave = random_bool(&random);
+ pdesc.fVertexEdgeType = GrDrawState::kHairLine_EdgeType;
}
} else {
- pdesc.fEdgeAANumEdges = 0;
}
pdesc.fColorMatrixEnabled = random_bool(&random);
@@ -635,24 +627,6 @@
}
}
-void GrGpuGLShaders::flushEdgeAAData() {
- const int& uni = fProgramData->fUniLocations.fEdgesUni;
- if (GrGLProgram::kUnusedUniform != uni) {
- int count = this->getDrawState().getNumAAEdges();
- GrDrawState::Edge edges[GrDrawState::kMaxEdges];
- // Flip the edges in Y
- float height =
- static_cast<float>(this->getDrawState().getRenderTarget()->height());
- for (int i = 0; i < count; ++i) {
- edges[i] = this->getDrawState().getAAEdges()[i];
- float b = edges[i].fY;
- edges[i].fY = -b;
- edges[i].fZ += b * height;
- }
- GL_CALL(Uniform3fv(uni, count, &edges[0].fX));
- }
-}
-
void GrGpuGLShaders::flushColorMatrix() {
const ProgramDesc& desc = fCurrentProgram.getDesc();
int matrixUni = fProgramData->fUniLocations.fColorMatrixUni;
@@ -853,7 +827,6 @@
}
}
}
- this->flushEdgeAAData();
this->flushColorMatrix();
resetDirtyFlags();
return true;
@@ -1108,10 +1081,6 @@
desc.fCoverageInput = ProgramDesc::kAttribute_ColorInput;
}
- desc.fEdgeAANumEdges = skipCoverage ? 0 : drawState.getNumAAEdges();
- desc.fEdgeAAConcave = desc.fEdgeAANumEdges > 0 &&
- drawState.isConcaveEdgeAAState();
-
int lastEnabledStage = -1;
if (!skipCoverage && (desc.fVertexLayout &
@@ -1294,7 +1263,6 @@
// other coverage inputs
if (!hasCoverage) {
hasCoverage =
- desc.fEdgeAANumEdges ||
requiresAttributeCoverage ||
(desc.fVertexLayout & GrDrawTarget::kEdge_VertexLayoutBit);
}