commit c49233410e7278f0b95b8b0d28a80105a2930a88
author bsalomon <bsalomon@google.com> Tue Sep 16 13:54:53 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Sep 16 13:54:53 2014 -0700
tree 4d452efbda22977c1d752cab94a7ec262cedc4c9
parent d664c21a38de98d8db210c46f7a8c4187f1534da

Make templated GrProgramTResource subclass of GrProgramResource

R=robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/563963004

src/gpu/GrDrawState.h

diff --git a/src/gpu/GrDrawState.h b/src/gpu/GrDrawState.h
index 4869658..f04d592 100644
--- a/src/gpu/GrDrawState.h
+++ b/src/gpu/GrDrawState.h
@@ -405,7 +405,7 @@
      * @param target  The render target to set.
      */
     void setRenderTarget(GrRenderTarget* target) {
-        fRenderTarget.setResource(SkSafeRef(target), GrProgramResource::kWrite_IOType);
+        fRenderTarget.set(SkSafeRef(target), GrProgramResource::kWrite_IOType);
         this->invalidateOptState();
     }
 

src/gpu/GrEffect.cpp

diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp
index b8d945e..50a1980 100644
--- a/src/gpu/GrEffect.cpp
+++ b/src/gpu/GrEffect.cpp
@@ -72,7 +72,7 @@
 
 void GrEffect::addTextureAccess(const GrTextureAccess* access) {
     fTextureAccesses.push_back(access);
-    this->addProgramResource(access->getTextureProgramResource());
+    this->addProgramResource(access->getProgramTexture());
 }
 
 void* GrEffect::operator new(size_t size) {

src/gpu/GrRODrawState.h

diff --git a/src/gpu/GrRODrawState.h b/src/gpu/GrRODrawState.h
index eea6f9b..7e57b08 100644
--- a/src/gpu/GrRODrawState.h
+++ b/src/gpu/GrRODrawState.h
@@ -397,8 +397,9 @@
                                GrBlendCoeff* srcCoeff = NULL,
                                GrBlendCoeff* dstCoeff = NULL) const;
 
+    typedef GrProgramTResource<GrRenderTarget> ProgramRenderTarget;
     // These fields are roughly sorted by decreasing likelihood of being different in op==
-    GrProgramResource                   fRenderTarget;
+    ProgramRenderTarget                 fRenderTarget;
     GrColor                             fColor;
     SkMatrix                            fViewMatrix;
     GrColor                             fBlendConstant;

src/gpu/GrTextureAccess.cpp

diff --git a/src/gpu/GrTextureAccess.cpp b/src/gpu/GrTextureAccess.cpp
index 0886db4..c4cde3d 100644
--- a/src/gpu/GrTextureAccess.cpp
+++ b/src/gpu/GrTextureAccess.cpp
@@ -46,7 +46,7 @@
     SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
 
     fParams = params;
-    fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
+    fTexture.set(SkRef(texture), GrProgramResource::kRead_IOType);
     this->setSwizzle(swizzle);
 }
 
@@ -58,14 +58,14 @@
     SkASSERT(strlen(swizzle) >= 1 && strlen(swizzle) <= 4);
 
     fParams.reset(tileXAndY, filterMode);
-    fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
+    fTexture.set(SkRef(texture), GrProgramResource::kRead_IOType);
     this->setSwizzle(swizzle);
 }
 
 void GrTextureAccess::reset(GrTexture* texture,
                             const GrTextureParams& params) {
     SkASSERT(texture);
-    fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
+    fTexture.set(SkRef(texture), GrProgramResource::kRead_IOType);
     fParams = params;
     memcpy(fSwizzle, "rgba", 5);
     fSwizzleMask = kRGBA_GrColorComponentFlags;
@@ -75,7 +75,7 @@
                             GrTextureParams::FilterMode filterMode,
                             SkShader::TileMode tileXAndY) {
     SkASSERT(texture);
-    fTexture.setResource(SkRef(texture), GrProgramResource::kRead_IOType);
+    fTexture.set(SkRef(texture), GrProgramResource::kRead_IOType);
     fParams.reset(tileXAndY, filterMode);
     memcpy(fSwizzle, "rgba", 5);
     fSwizzleMask = kRGBA_GrColorComponentFlags;