Remove GrDrawState::setSampler, use direct access to sampler
Review URL: http://codereview.appspot.com/5476052/
git-svn-id: http://skia.googlecode.com/svn/trunk@2852 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/include/gpu/GrSamplerState.h b/include/gpu/GrSamplerState.h
index c0f7fd4..f1fc86d 100644
--- a/include/gpu/GrSamplerState.h
+++ b/include/gpu/GrSamplerState.h
@@ -91,14 +91,6 @@
this->reset();
}
- GrSamplerState(WrapMode wrapXAndY,
- Filter filter)
- : fRadial2CenterX1()
- , fRadial2Radius0()
- , fRadial2PosRoot() {
- this->reset(wrapXAndY, filter);
- }
-
WrapMode getWrapX() const { return fWrapX; }
WrapMode getWrapY() const { return fWrapY; }
SampleMode getSampleMode() const { return fSampleMode; }
@@ -190,6 +182,15 @@
fTextureDomain.setEmpty();
fSwapRAndB = false;
}
+ void reset(const GrMatrix& matrix) {
+ fWrapX = kClamp_WrapMode;
+ fWrapY = kClamp_WrapMode;
+ fSampleMode = kNormal_SampleMode;
+ fFilter = kNearest_Filter;
+ fMatrix = matrix;
+ fTextureDomain.setEmpty();
+ fSwapRAndB = false;
+ }
GrScalar getRadial2CenterX1() const { return fRadial2CenterX1; }
GrScalar getRadial2Radius0() const { return fRadial2Radius0; }