Move GrTextureParams from GrSamplerState to GrTextureAccess

Review URL: https://codereview.appspot.com/6496135/



git-svn-id: http://skia.googlecode.com/svn/trunk@5582 2bbb7eff-a529-9590-31e7-b0007b416f81

1 files changed, 4 insertions, 81 deletions

diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h
index e8182f9787..385dba7bdd 100644
--- a/include/gpu/GrSamplerState.h
+++ b/include/gpu/GrSamplerState.h
@@ -17,69 +17,6 @@
 
 #include "SkShader.h"
 
-class GrTextureParams {
-public:
-    GrTextureParams() {
-        this->reset();
-    }
-
-    GrTextureParams(const GrTextureParams& params) {
-        *this = params;
-    }
-
-    GrTextureParams& operator =(const GrTextureParams& params) {
-        fTileModes[0] = params.fTileModes[0];
-        fTileModes[1] = params.fTileModes[1];
-        fBilerp = params.fBilerp;
-        return *this;
-    }
-
-    void reset() {
-        this->reset(SkShader::kClamp_TileMode, false);
-    }
-
-    void reset(SkShader::TileMode tileXAndY, bool filter) {
-        fTileModes[0] = fTileModes[1] = tileXAndY;
-        fBilerp = filter;
-    }
-    void reset(SkShader::TileMode tileModes[2], bool filter) {
-        fTileModes[0] = tileModes[0];
-        fTileModes[1] = tileModes[1];
-        fBilerp = filter;
-    }
-
-    void setClampNoFilter() {
-        fTileModes[0] = fTileModes[1] = SkShader::kClamp_TileMode;
-        fBilerp = false;
-    }
-
-    void setClamp() {
-        fTileModes[0] = fTileModes[1] = SkShader::kClamp_TileMode;
-    }
-
-    void setBilerp(bool bilerp) { fBilerp = bilerp; }
-
-    void setTileModeX(const SkShader::TileMode tm) { fTileModes[0] = tm; }
-    void setTileModeY(const SkShader::TileMode tm) { fTileModes[1] = tm; }
-    void setTileModeXAndY(const SkShader::TileMode tm) { fTileModes[0] = fTileModes[1] = tm; }
-
-    SkShader::TileMode getTileModeX() const { return fTileModes[0]; }
-
-    SkShader::TileMode getTileModeY() const { return fTileModes[1]; }
-
-    bool isTiled() const {
-        return SkShader::kClamp_TileMode != fTileModes[0] ||
-               SkShader::kClamp_TileMode != fTileModes[1];
-    }
-
-    bool isBilerp() const { return fBilerp; }
-
-private:
-
-    SkShader::TileMode fTileModes[2];
-    bool               fBilerp;
-};
-
 class GrSamplerState {
 public:
     static const bool kBilerpDefault = false;
@@ -118,19 +55,13 @@ public:
     bool operator !=(const GrSamplerState& s) const { return !(*this == s); }
 
     GrSamplerState& operator =(const GrSamplerState& s) {
-        // memcpy() breaks refcounting
-        fTextureParams = s.fTextureParams;
         fMatrix = s.fMatrix;
-
         GrSafeAssign(fCustomStage, s.fCustomStage);
-
         return *this;
     }
 
     const GrMatrix& getMatrix() const { return fMatrix; }
 
-    GrTextureParams* textureParams() { return &fTextureParams; }
-    const GrTextureParams& getTextureParams() const { return fTextureParams; }
     /**
      * Access the sampler's matrix. See SampleMode for explanation of
      * relationship between the matrix and sample mode.
@@ -149,21 +80,14 @@ public:
      */
     void preConcatMatrix(const GrMatrix& matrix) { fMatrix.preConcat(matrix); }
 
-    void reset(SkShader::TileMode tileXAndY,
-               bool filter,
-               const GrMatrix& matrix) {
-        fTextureParams.reset(tileXAndY, filter);
+    void reset(const GrMatrix& matrix) {
         fMatrix = matrix;
         GrSafeSetNull(fCustomStage);
     }
-    void reset(SkShader::TileMode wrapXAndY, bool filter) {
-        this->reset(wrapXAndY, filter, GrMatrix::I());
-    }
-    void reset(const GrMatrix& matrix) {
-        this->reset(kTileModeDefault, kBilerpDefault, matrix);
-    }
+
     void reset() {
-        this->reset(kTileModeDefault, kBilerpDefault, GrMatrix::I());
+        fMatrix.reset();
+        GrSafeSetNull(fCustomStage);
     }
 
     GrCustomStage* setCustomStage(GrCustomStage* stage) {
@@ -173,7 +97,6 @@ public:
     const GrCustomStage* getCustomStage() const { return fCustomStage; }
 
 private:
-    GrTextureParams     fTextureParams;
     GrMatrix            fMatrix;
 
     GrCustomStage*      fCustomStage;