Add class GrGLTextureRenderTarget for GL texture/rendertarget objects

src/gpu/gl/GrGLTexture.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef GrGLTexture_DEFINED
 #define GrGLTexture_DEFINED
 
 #include "GrGpu.h"
-#include "GrGLRenderTarget.h"
+#include "GrTexture.h"
+#include "GrGLUtil.h"
 

[robertphillips, 2014/11/03 13:58:54]

Can we move GrGLTexID into GrGLTexture.cpp ?

[bsalomon, 2014/11/03 15:20:14]

Yup, forthcoming.

 /**
  * A ref counted tex id that deletes the texture in its destructor.
  */
 class GrGLTexID : public SkRefCnt {
 public:
     SK_DECLARE_INST_COUNT(GrGLTexID)
 
     GrGLTexID(const GrGLInterface* gl, GrGLuint texID, bool isWrapped)
         : fGL(gl)
         , fTexID(texID)
@@ skipping 30 matching lines @@
         GrGLenum fWrapT;
         GrGLenum fSwizzleRGBA[4];
         void invalidate() { memset(this, 0xff, sizeof(TexParams)); }
     };
 
     struct IDDesc {
         GrGLuint        fTextureID;
         bool            fIsWrapped;
     };
 
-    // creates a texture that is also an RT
-    GrGLTexture(GrGpuGL* gpu, const GrSurfaceDesc&, const IDDesc&, const GrGLRenderTarget::IDDesc&);
-
-    // creates a non-RT texture
     GrGLTexture(GrGpuGL* gpu, const GrSurfaceDesc&, const IDDesc&);
 
     virtual ~GrGLTexture() { this->release(); }
 
     virtual GrBackendObject getTextureHandle() const SK_OVERRIDE;
 
     virtual void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); }
 
     // These functions are used to track the texture parameters associated with the texture.
     const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const {
         *timestamp = fTexParamsTimestamp;
         return fTexParams;
     }
 
     void setCachedTexParams(const TexParams& texParams,
                             GrGpu::ResetTimestamp timestamp) {
         fTexParams = texParams;
         fTexParamsTimestamp = timestamp;
     }
 
     GrGLuint textureID() const { return (fTexIDObj.get()) ? fTexIDObj->id() : 0; }
 
 protected:
-    // overrides of GrTexture
+    // The public constructor registers this object with the cache. However, only the most derived
+    // class should register with the cache. This constructor does not do the registration and
+    // rather moves that burden onto the derived class.
+    enum Derived { kDerived };
+    GrGLTexture(GrGpuGL* gpu, const GrSurfaceDesc&, const IDDesc&, Derived);
+
     virtual void onAbandon() SK_OVERRIDE;
     virtual void onRelease() SK_OVERRIDE;
 
 private:
     TexParams                       fTexParams;
     GrGpu::ResetTimestamp           fTexParamsTimestamp;
     SkAutoTUnref<GrGLTexID>         fTexIDObj;
 
-    void init(GrGpuGL* gpu, const GrSurfaceDesc&, const IDDesc&, const GrGLRenderTarget::IDDesc*);
-
     typedef GrTexture INHERITED;
 };
 
 #endif