Make templated GrProgramTResource subclass of GrProgramResource

include/gpu/GrTextureAccess.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTextureAccess_DEFINED
 #define GrTextureAccess_DEFINED
 
+#include "GrProgramResource.h"
+#include "GrTexture.h"
 #include "SkRefCnt.h"
 #include "SkShader.h"
-#include "GrProgramResource.h"
-
-class GrTexture;
 
 /**
  * Represents the filtering and tile modes used to access a texture. It is mostly used with
  * GrTextureAccess (defined below). Also, some of the texture cache methods require knowledge about
  * filtering and tiling to perform a cache lookup. If it wasn't for this latter usage this would
  * be folded into GrTextureAccess. The default is clamp tile modes and no filtering.
  */
 class GrTextureParams {
 public:
     GrTextureParams() {
@@ skipping 130 matching lines @@
         SkASSERT(memcmp(fSwizzle, other.fSwizzle, sizeof(fSwizzle)-1) ==
                  strcmp(fSwizzle, other.fSwizzle));
 #endif
         return fParams == other.fParams &&
                (this->getTexture() == other.getTexture()) &&
                (0 == memcmp(fSwizzle, other.fSwizzle, sizeof(fSwizzle)-1));
     }
 
     bool operator!= (const GrTextureAccess& other) const { return !(*this == other); }
 
-    GrTexture* getTexture() const { return (GrTexture*)fTexture.getResource(); }
+    GrTexture* getTexture() const { return fTexture.get(); }
 
     /**
      * For internal use by GrEffect.
      */
-    const GrProgramResource* getTextureProgramResource() const { return &fTexture; }
+    const GrProgramResource* getProgramTexture() const { return &fTexture; }
 
     /**
      * Returns a string representing the swizzle. The string is is null-terminated.
      */
     const char* getSwizzle() const { return fSwizzle; }
 
     /** Returns a mask indicating which components are referenced in the swizzle. The return
         is a bitfield of GrColorComponentFlags. */
     uint32_t swizzleMask() const { return fSwizzleMask; }
 
     const GrTextureParams& getParams() const { return fParams; }
 
 private:
     void setSwizzle(const char*);
 
-    GrProgramResource               fTexture;
+    typedef GrProgramTResource<GrTexture> ProgramTexture;
+
+    ProgramTexture                  fTexture;
     GrTextureParams                 fParams;
     uint32_t                        fSwizzleMask;
     char                            fSwizzle[5];
 
     typedef SkNoncopyable INHERITED;
 };
 
 #endif