Add class GrGLTextureRenderTarget for GL texture/rendertarget objects

include/gpu/GrTexture.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 GrTexture_DEFINED
 #define GrTexture_DEFINED
 
 #include "GrSurface.h"
-#include "GrRenderTarget.h"
 #include "SkPoint.h"
 #include "SkRefCnt.h"
 
 class GrResourceKey;
 class GrTextureParams;
 class GrTexturePriv;
 
-class GrTexture : public GrSurface {
+class GrTexture : virtual public GrSurface {
 public:
     /**
      *  Approximate number of bytes used by the texture
      */
     virtual size_t gpuMemorySize() const SK_OVERRIDE;
 
     virtual GrTexture* asTexture() SK_OVERRIDE { return this; }
     virtual const GrTexture* asTexture() const SK_OVERRIDE { return this; }
-    virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE { return fRenderTarget.get(); }
-    virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE { return fRenderTarget.get(); }
 
     /**
      *  Return the native ID or handle to the texture, depending on the
      *  platform. e.g. on OpenGL, return the texture ID.
      */
     virtual GrBackendObject getTextureHandle() const = 0;
 
     /**
      * This function indicates that the texture parameters (wrap mode, filtering, ...) have been
      * changed externally to Skia.
      */
     virtual void textureParamsModified() = 0;
 
 #ifdef SK_DEBUG
     void validate() const {
         this->INHERITED::validate();
         this->validateDesc();
     }
 #endif
 
     /** Access methods that are only to be used within Skia code. */
     inline GrTexturePriv texturePriv();
     inline const GrTexturePriv texturePriv() const;
 
 protected:
-    // A texture refs its rt representation but not vice-versa. It is up to
-    // the subclass constructor to initialize this pointer.
-    SkAutoTUnref<GrRenderTarget> fRenderTarget;
-
     GrTexture(GrGpu* gpu, bool isWrapped, const GrSurfaceDesc& desc);
 
-    virtual ~GrTexture();
-
-    // GrResource overrides
-    virtual void onRelease() SK_OVERRIDE;
-    virtual void onAbandon() SK_OVERRIDE;
-
     void validateDesc() const;
 
 private:
     void dirtyMipMaps(bool mipMapsDirty);
 
     enum MipMapsStatus {
         kNotAllocated_MipMapsStatus,
         kAllocated_MipMapsStatus,
         kValid_MipMapsStatus
     };
@@ skipping 42 matching lines @@
         fTexture.reset(SkSafeRef(texture));
         return texture;
     }
 
 private:
     SkAutoTUnref<GrTexture> fTexture;
     SkIPoint                fOffset;
 };
 
 #endif