commit 2a9ca782ba5db5a7ebdc315655d9a30dcd6d9845
author bsalomon <bsalomon@google.com> Fri Sep 05 14:27:43 2014 -0700
committer Commit bot <commit-bot@chromium.org> Fri Sep 05 14:27:43 2014 -0700
tree 80ededcb7acfb6facf9229d80ade757d19b1e458
parent 03e844a0bc5f7b5dff14e3a06e8fc4ab6bfb16ea

Make GrDrawState and GrEffectStage use the pending io/exec ref mechanisms.

BUG=skia:2889
R=robertphillips@google.com

Author: bsalomon@google.com

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

src/gpu/GrTextureAccess.cpp

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