diff options
author | 2012-10-16 14:16:11 +0000 | |
---|---|---|
committer | 2012-10-16 14:16:11 +0000 | |
commit | b022177777c3602c47bb71c07920e63a261c5038 (patch) | |
tree | 9a23dbdc3b2c265bea0a5749bfd10b8602686be9 /include/gpu/GrSamplerState.h | |
parent | 1708eea54ddd2c6c5f96e9e132980ec3fd2ee648 (diff) |
Require matrix for custom stage to be set when custom stage is installed.
Review URL: https://codereview.appspot.com/6696044
git-svn-id: http://skia.googlecode.com/svn/trunk@5962 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'include/gpu/GrSamplerState.h')
-rw-r--r-- | include/gpu/GrSamplerState.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h index 385dba7bdd..da52e95277 100644 --- a/include/gpu/GrSamplerState.h +++ b/include/gpu/GrSamplerState.h @@ -19,14 +19,7 @@ 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)); @@ -63,12 +56,6 @@ 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 @@ -80,10 +67,10 @@ public: */ void preConcatMatrix(const GrMatrix& matrix) { fMatrix.preConcat(matrix); } - void reset(const GrMatrix& matrix) { - fMatrix = matrix; - GrSafeSetNull(fCustomStage); - } + /** + * Do not call this function. It will be removed soon. + */ + void setMatrixDeprecated(const GrMatrix& matrix) { fMatrix = matrix; } void reset() { fMatrix.reset(); @@ -92,8 +79,16 @@ 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: |