Remove a couple things missed when deleting the tessellated path renderer

Review URL: http://codereview.appspot.com/6249070/



git-svn-id: http://skia.googlecode.com/svn/trunk@4082 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 0 insertions, 17 deletions

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 79d6d483f1..5490b6851f 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -619,12 +619,6 @@ public:
          */
         kNoColorWrites_StateBit = 0x08,
         /**
-         * Modifies the behavior of edge AA specified by setEdgeAA. If set, 
-         * will test edge pairs for convexity when rasterizing. Set this if the 
-         * source polygon is non-convex.
-         */
-        kEdgeAAConcave_StateBit = 0x10,
-        /**
          * Draws will apply the color matrix, otherwise the color matrix is
          * ignored.
          */
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index 3e4f966f29..d752f1f60f 100644
--- a/src/gpu/gl/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -38,7 +38,6 @@ typedef GrGLProgram::ProgramDesc::StageDesc StageDesc;
 #define EDGE_ATTR_NAME "aEdge"
 #define COL_UNI_NAME "uColor"
 #define COV_UNI_NAME "uCoverage"
-#define EDGES_UNI_NAME "uEdges"
 #define COL_FILTER_UNI_NAME "uColorFilter"
 #define COL_MATRIX_UNI_NAME "uColorMatrix"
 #define COL_MATRIX_VEC_UNI_NAME "uColorMatrixVec"
@@ -1144,14 +1143,6 @@ void GrGLProgram::getUniformLocationsAndInitCache(const GrGLContextInfo& gl,
         GrAssert(kUnusedUniform != programData->fUniLocations.fCoverageUni);
     }
 
-    if (kUseUniform == programData->fUniLocations.fEdgesUni) {
-        GL_CALL_RET(programData->fUniLocations.fEdgesUni,
-                    GetUniformLocation(progID, EDGES_UNI_NAME));
-        GrAssert(kUnusedUniform != programData->fUniLocations.fEdgesUni);
-    } else {
-        programData->fUniLocations.fEdgesUni = kUnusedUniform;
-    }
-
     for (int s = 0; s < GrDrawState::kNumStages; ++s) {
         StageUniLocations& locations = programData->fUniLocations.fStages[s];
         if (fProgramDesc.fStages[s].isEnabled()) {
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 991f86f21e..be12b9c7ce 100644
--- a/src/gpu/gl/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -285,7 +285,6 @@ public:
         GrGLint fViewMatrixUni;
         GrGLint fColorUni;
         GrGLint fCoverageUni;
-        GrGLint fEdgesUni;
         GrGLint fColorFilterUni;
         GrGLint fColorMatrixUni;
         GrGLint fColorMatrixVecUni;
@@ -294,7 +293,6 @@ public:
             fViewMatrixUni = kUnusedUniform;
             fColorUni = kUnusedUniform;
             fCoverageUni = kUnusedUniform;
-            fEdgesUni = kUnusedUniform;
             fColorFilterUni = kUnusedUniform;
             fColorMatrixUni = kUnusedUniform;
             fColorMatrixVecUni = kUnusedUniform;