Remove GrGLTexID

src/gpu/gl/GrGLTexture.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrGLTexture.h"
 #include "GrGpuGL.h"
 
@@ skipping 11 matching lines @@
 GrGLTexture::GrGLTexture(GrGpuGL* gpu, const GrSurfaceDesc& desc, const IDDesc& idDesc, Derived)
     : INHERITED(gpu, idDesc.fIsWrapped, desc)
     , GrSurface(gpu, idDesc.fIsWrapped, desc) {
     this->init(desc, idDesc);
 }
 
 void GrGLTexture::init(const GrSurfaceDesc& desc, const IDDesc& idDesc) {
     SkASSERT(0 != idDesc.fTextureID);
     fTexParams.invalidate();
     fTexParamsTimestamp = GrGpu::kExpiredTimestamp;
-    fTexIDObj.reset(SkNEW_ARGS(GrGLTexID, (GPUGL->glInterface(),
-                                           idDesc.fTextureID,
-                                           idDesc.fIsWrapped)));
+    fTextureID = idDesc.fTextureID;
 }
 
 void GrGLTexture::onRelease() {

[robertphillips, 2014/11/03 15:56:01]

Don't we still need to worry if it is wrapped ?

[bsalomon, 2014/11/03 15:58:15]

Oh, of course. Fixed.

-    fTexIDObj.reset(NULL);
+    if (fTextureID) {
+        GL_CALL(DeleteTextures(1, &fTextureID));
+        fTextureID = 0;
+    }
     INHERITED::onRelease();
 }
 
 void GrGLTexture::onAbandon() {
-    if (fTexIDObj.get()) {
-        fTexIDObj->abandon();
-        fTexIDObj.reset(NULL);
-    }
-
+    fTextureID = 0;
     INHERITED::onAbandon();
 }
 
 GrBackendObject GrGLTexture::getTextureHandle() const {
     return static_cast<GrBackendObject>(this->textureID());
 }