Factor GrTexture into public GrTexture and private GrTextureImpl.

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 "SkPoint.h"
 #include "GrRenderTarget.h"
 
 class GrResourceKey;
 class GrTextureParams;
+class GrTextureImpl;
 
 class GrTexture : public GrSurface {
-
 public:
-    SK_DECLARE_INST_COUNT(GrTexture)
-    // from GrResource
-    /**
-     * Informational texture flags
-     */
-    enum FlagBits {
-        kFirstBit = (kLastPublic_GrTextureFlagBit << 1),
-
-        /**
-         * This texture should be returned to the texture cache when
-         * it is no longer reffed
-         */
-        kReturnToCache_FlagBit        = kFirstBit,
-    };
-
-    void setFlag(GrTextureFlags flags) {
-        fDesc.fFlags = fDesc.fFlags | flags;
-    }
-    void resetFlag(GrTextureFlags flags) {
-        fDesc.fFlags = fDesc.fFlags & ~flags;
-    }
-    bool isSetFlag(GrTextureFlags flags) const {
-        return 0 != (fDesc.fFlags & flags);
-    }
-
-    void dirtyMipMaps(bool mipMapsDirty);
-
-    bool mipMapsAreDirty() const {
-        return kValid_MipMapsStatus != fMipMapsStatus;
-    }
-
     /**
      *  Approximate number of bytes used by the texture
      */
     virtual size_t gpuMemorySize() const SK_OVERRIDE;
 
     // GrSurface overrides
     virtual bool readPixels(int left, int top, int width, int height,
                             GrPixelConfig config,
                             void* buffer,
                             size_t rowBytes = 0,
                             uint32_t pixelOpsFlags = 0) SK_OVERRIDE;
 
     virtual void writePixels(int left, int top, int width, int height,
                              GrPixelConfig config,
                              const void* buffer,
                              size_t rowBytes = 0,
                              uint32_t pixelOpsFlags = 0) SK_OVERRIDE;
 
-    /**
-     * @return this texture
-     */
     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(); }
 
     /**
-     * Retrieves the render target underlying this texture that can be passed to
-     * GrGpu::setRenderTarget().
-     *
-     * @return    handle to render target or NULL if the texture is not a
-     *            render target
-     */
-    virtual GrRenderTarget* asRenderTarget() SK_OVERRIDE {
-        return fRenderTarget.get();
-    }
-    virtual const GrRenderTarget* asRenderTarget() const SK_OVERRIDE {
-        return fRenderTarget.get();
-    }
-
-    // GrTexture
-    /**
-     * Convert from texels to normalized texture coords for POT textures
-     * only.
+     * Convert from texels to normalized texture coords for POT textures only. Please don't add
+     * new callsites for these functions. They are slated for removal.
      */
     SkFixed normalizeFixedX(SkFixed x) const {
         SkASSERT(GrIsPow2(fDesc.fWidth));
         return x >> fShiftFixedX;
     }
     SkFixed normalizeFixedY(SkFixed y) const {
         SkASSERT(GrIsPow2(fDesc.fHeight));
         return y >> fShiftFixedY;
     }
 
     /**
      *  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;
 
-    /**
-     *  Call this when the state of the native API texture object is
-     *  altered directly, without being tracked by skia.
-     */
-    virtual void invalidateCachedState() = 0;
-
 #ifdef SK_DEBUG
     void validate() const {
         this->INHERITED::validate();
 
         this->validateDesc();
     }
 #endif
 
-    static GrResourceKey ComputeKey(const GrGpu* gpu,
-                                    const GrTextureParams* params,
-                                    const GrTextureDesc& desc,
-                                    const GrCacheID& cacheID);
-    static GrResourceKey ComputeScratchKey(const GrTextureDesc& desc);
-    static bool NeedsResizing(const GrResourceKey& key);
-    static bool NeedsBilerp(const GrResourceKey& key);
+    GrTextureImpl* impl() { return reinterpret_cast<GrTextureImpl*>(this); }

[bsalomon, 2014/05/09 14:44:15]

This can only be static_cast if GrTextureImpl is already defined. The forward
declaration doesn't communicate the inheritance.

+    const GrTextureImpl* impl() const { return reinterpret_cast<const GrTextureImpl*>(this); }
 
 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 GrTextureDesc& desc)
     : INHERITED(gpu, isWrapped, desc)
-    , fRenderTarget(NULL)
-    , fMipMapsStatus(kNotAllocated_MipMapsStatus) {
-
+    , fRenderTarget(NULL) {
         // only make sense if alloc size is pow2
         fShiftFixedX = 31 - SkCLZ(fDesc.fWidth);
         fShiftFixedY = 31 - SkCLZ(fDesc.fHeight);
     }
+
     virtual ~GrTexture();
 
     // GrResource overrides
     virtual void onRelease() SK_OVERRIDE;
     virtual void onAbandon() SK_OVERRIDE;
 
     void validateDesc() const;
 
 private:
+    virtual void internal_dispose() const SK_OVERRIDE;
+
+    // these two shift a fixed-point value into normalized coordinates
+    // for this texture if the texture is power of two sized.
+    int                 fShiftFixedX;
+    int                 fShiftFixedY;
+
+    typedef GrSurface INHERITED;
+};
+
+class GrTextureImpl : public GrTexture {

[bsalomon, 2014/05/09 14:44:15]

Kept this in the same file for the initial review. A follow on change will add
src/gpu/GrTextureImpl.h and move this class there.

+public:

[robertphillips, 2014/05/09 14:57:22]

Name here

[bsalomon, 2014/05/09 15:10:39]

Done.

+    SK_DECLARE_INST_COUNT(GrTexture)
+    /**
+     * Informational texture flags
+     */
+    enum FlagBits {
+        kFirstBit = (kLastPublic_GrTextureFlagBit << 1),
+
+        /**
+         * This texture should be returned to the texture cache when
+         * it is no longer reffed
+         */
+        kReturnToCache_FlagBit        = kFirstBit,
+    };
+
+    void setFlag(GrTextureFlags flags) {
+        fDesc.fFlags = fDesc.fFlags | flags;
+    }
+    void resetFlag(GrTextureFlags flags) {
+        fDesc.fFlags = fDesc.fFlags & ~flags;
+    }
+    bool isSetFlag(GrTextureFlags flags) const {
+        return 0 != (fDesc.fFlags & flags);
+    }
+
+    void dirtyMipMaps(bool mipMapsDirty);
+
+    bool mipMapsAreDirty() const {
+        return kValid_MipMapsStatus != fMipMapsStatus;
+    }
+
+    /**
+     *  Call this when the state of the native API texture object is
+     *  altered directly, without being tracked by skia.
+     */
+    virtual void invalidateCachedState() = 0;
+
+    static GrResourceKey ComputeKey(const GrGpu* gpu,
+                                    const GrTextureParams* params,
+                                    const GrTextureDesc& desc,
+                                    const GrCacheID& cacheID);
+    static GrResourceKey ComputeScratchKey(const GrTextureDesc& desc);
+    static bool NeedsResizing(const GrResourceKey& key);
+    static bool NeedsBilerp(const GrResourceKey& key);
+
+protected:
+    GrTextureImpl(GrGpu* gpu, bool isWrapped, const GrTextureDesc& desc)
+    : INHERITED(gpu, isWrapped, desc)
+    , fMipMapsStatus(kNotAllocated_MipMapsStatus) {
+    }
+
+private:
     enum MipMapsStatus {
         kNotAllocated_MipMapsStatus,
         kAllocated_MipMapsStatus,
         kValid_MipMapsStatus
     };
 
-    // these two shift a fixed-point value into normalized coordinates
-    // for this texture if the texture is power of two sized.
-    int                 fShiftFixedX;
-    int                 fShiftFixedY;
-
     MipMapsStatus       fMipMapsStatus;
 

[robertphillips, 2014/05/09 14:57:22]

Can't GrTexture just access fMipMapsStatus via the public API?

[bsalomon, 2014/05/09 15:10:39]

It was accessing the flags enum. But I added a public bool hasMipMaps() to
obviate the need for the enum values and removed the friend.

-    virtual void internal_dispose() const SK_OVERRIDE;
-
-    typedef GrSurface INHERITED;
+    friend class GrTexture;
+    typedef GrTexture INHERITED;
 };
 
 /**
  * Represents a texture that is intended to be accessed in device coords with an offset.
  */
 class GrDeviceCoordTexture {
 public:
     GrDeviceCoordTexture() { fOffset.set(0, 0); }
 
     GrDeviceCoordTexture(const GrDeviceCoordTexture& other) {
@@ skipping 15 matching lines @@
 
     void setOffset(const SkIPoint& offset) { fOffset = offset; }
     void setOffset(int ox, int oy) { fOffset.set(ox, oy); }
 
     GrTexture* texture() const { return fTexture.get(); }
 
     GrTexture* setTexture(GrTexture* texture) {
         fTexture.reset(SkSafeRef(texture));
         return texture;
     }
+
 private:
     SkAutoTUnref<GrTexture> fTexture;
     SkIPoint                fOffset;
 };
 
 #endif