diff options
author | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-16 14:31:26 +0000 |
---|---|---|
committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-16 14:31:26 +0000 |
commit | f6eac8af585e44d56e6b18d269e6c34f9917ea88 (patch) | |
tree | 46332930405593186d0956fb29f093cd0afff80f /include/gpu/GrSamplerState.h | |
parent | b022177777c3602c47bb71c07920e63a261c5038 (diff) |
Revert r5962 because of failures.
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrSamplerState.h')
-rw-r--r-- | include/gpu/GrSamplerState.h | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h index da52e95277..385dba7bdd 100644 --- a/include/gpu/GrSamplerState.h +++ b/include/gpu/GrSamplerState.h @@ -19,7 +19,14 @@ class GrSamplerState { public: + static const bool kBilerpDefault = false; + static const SkShader::TileMode kTileModeDefault = SkShader::kClamp_TileMode; + + /** + * Default sampler state is set to clamp, use normal sampling mode, be + * unfiltered, and use identity matrix. + */ GrSamplerState() : fCustomStage (NULL) { memset(this, 0, sizeof(GrSamplerState)); @@ -56,6 +63,12 @@ public: const GrMatrix& getMatrix() const { return fMatrix; } /** + * Access the sampler's matrix. See SampleMode for explanation of + * relationship between the matrix and sample mode. + */ + GrMatrix* matrix() { return &fMatrix; } + + /** * Multiplies the current sampler matrix a matrix * * After this call M' = M*m where M is the old matrix, m is the parameter @@ -67,10 +80,10 @@ public: */ void preConcatMatrix(const GrMatrix& matrix) { fMatrix.preConcat(matrix); } - /** - * Do not call this function. It will be removed soon. - */ - void setMatrixDeprecated(const GrMatrix& matrix) { fMatrix = matrix; } + void reset(const GrMatrix& matrix) { + fMatrix = matrix; + GrSafeSetNull(fCustomStage); + } void reset() { fMatrix.reset(); @@ -79,16 +92,8 @@ public: GrCustomStage* setCustomStage(GrCustomStage* stage) { GrSafeAssign(fCustomStage, stage); - fMatrix.reset(); return stage; } - - GrCustomStage* setCustomStage(GrCustomStage* stage, const GrMatrix& matrix) { - GrSafeAssign(fCustomStage, stage); - fMatrix = matrix; - return stage; - } - const GrCustomStage* getCustomStage() const { return fCustomStage; } private: |