Revert r5962 because of failures.
git-svn-id: http://skia.googlecode.com/svn/trunk@5963 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h
index da52e95..385dba7 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 @@
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 @@
*/
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 @@
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: