Revert of Wrap NV_path_rendering API with GrGLPathRendering

src/gpu/gl/GrGLPathRange.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLPathRange.h"
 #include "GrGLPath.h"
-#include "GrGLPathRendering.h"
 #include "GrGpuGL.h"
 
-GrGLPathRange::GrGLPathRange(GrGpuGL* gpu, size_t size, const SkStrokeRec& stroke)
+#define GPUGL static_cast<GrGpuGL*>(this->getGpu())
+
+#define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X)
+#define GL_CALL_RET(R, X) GR_GL_CALL_RET(GPUGL->glInterface(), R, X)
+
+GrGLPathRange::GrGLPathRange(GrGpu* gpu, size_t size, const SkStrokeRec& stroke)
     : INHERITED(gpu, size, stroke),
-      fBasePathID(gpu->pathRendering()->genPaths(fSize)),
       fNumDefinedPaths(0) {
+    GL_CALL_RET(fBasePathID, GenPaths(fSize));
 }
 
 GrGLPathRange::~GrGLPathRange() {
     this->release();
 }
 
 void GrGLPathRange::initAt(size_t index, const SkPath& skPath) {
     GrGpuGL* gpu = static_cast<GrGpuGL*>(this->getGpu());
     if (NULL == gpu) {
         return;
     }
 
+#ifdef SK_DEBUG
     // Make sure the path at this index hasn't been initted already.
-    SkASSERT(GR_GL_FALSE == gpu->pathRendering()->isPath(fBasePathID + index));
+    GrGLboolean hasPathAtIndex;
+    GL_CALL_RET(hasPathAtIndex, IsPath(fBasePathID + index));
+    SkASSERT(GR_GL_FALSE == hasPathAtIndex);
+#endif
 
-    GrGLPath::InitPathObject(gpu, fBasePathID + index, skPath, fStroke);
+    GrGLPath::InitPathObject(gpu->glInterface(), fBasePathID + index, skPath, fStroke);
+
     ++fNumDefinedPaths;
     this->didChangeGpuMemorySize();
 }
 
 void GrGLPathRange::onRelease() {
     SkASSERT(NULL != this->getGpu());
 
     if (0 != fBasePathID && !this->isWrapped()) {
-        static_cast<GrGpuGL*>(this->getGpu())->pathRendering()->deletePaths(fBasePathID, fSize);
+        GL_CALL(DeletePaths(fBasePathID, fSize));
         fBasePathID = 0;
     }
 
     INHERITED::onRelease();
 }
 
 void GrGLPathRange::onAbandon() {
     fBasePathID = 0;
 
     INHERITED::onAbandon();
 }