diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-17 21:39:42 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-17 21:39:42 +0000 |
| commit | fd03d4a829efe2d77a712fd991927c55f59a2ffe (patch) | |
| tree | b207777f1e3fe70b5823a2bc166a75c71f311036 /src/gpu/effects | |
| parent | 5dd567c2a55c16c8bc2668902cdfce1734dfae8f (diff) | |
Replace all instances of GrRect with SkRect.
And remove the typedef in GrRect.h. The same with GrIRect.
R=robertphillips@google.com
Author: tfarina@chromium.org
Review URL: https://chromiumcodereview.appspot.com/19449002
git-svn-id: http://skia.googlecode.com/svn/trunk@10130 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/effects')
| -rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 4 | ||||
| -rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.cpp | 8 | ||||
| -rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index db6141f8e9..d1c7fea16d 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -213,8 +213,8 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context *pmToUPMRule = kConversionRules[i][0]; *upmToPMRule = kConversionRules[i][1]; - static const GrRect kDstRect = GrRect::MakeWH(SkIntToScalar(256), SkIntToScalar(256)); - static const GrRect kSrcRect = GrRect::MakeWH(SK_Scalar1, SK_Scalar1); + static const SkRect kDstRect = SkRect::MakeWH(SkIntToScalar(256), SkIntToScalar(256)); + static const SkRect kSrcRect = SkRect::MakeWH(SK_Scalar1, SK_Scalar1); // We do a PM->UPM draw from dataTex to readTex and read the data. Then we do a UPM->PM draw // from readTex to tempTex followed by a PM->UPM draw to readTex and finally read the data. // We then verify that two reads produced the same values. diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index dcfda287ff..96372d926f 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -108,7 +108,7 @@ void GrGLTextureDomainEffect::emitCode(GrGLShaderBuilder* builder, void GrGLTextureDomainEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect& drawEffect) { const GrTextureDomainEffect& texDom = drawEffect.castEffect<GrTextureDomainEffect>(); - const GrRect& domain = texDom.domain(); + const SkRect& domain = texDom.domain(); float values[4] = { SkScalarToFloat(domain.left()), @@ -151,7 +151,7 @@ GrGLEffect::EffectKey GrGLTextureDomainEffect::GenKey(const GrDrawEffect& drawEf GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture, const SkMatrix& matrix, - const GrRect& domain, + const SkRect& domain, WrapMode wrapMode, bool bilerp, CoordsType coordsType) { @@ -185,7 +185,7 @@ GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture, GrTextureDomainEffect::GrTextureDomainEffect(GrTexture* texture, const SkMatrix& matrix, - const GrRect& domain, + const SkRect& domain, WrapMode wrapMode, bool bilerp, CoordsType coordsType) @@ -226,7 +226,7 @@ GrEffectRef* GrTextureDomainEffect::TestCreate(SkMWCRandom* random, GrTexture* textures[]) { int texIdx = random->nextBool() ? GrEffectUnitTest::kSkiaPMTextureIdx : GrEffectUnitTest::kAlphaTextureIdx; - GrRect domain; + SkRect domain; domain.fLeft = random->nextUScalar1(); domain.fRight = random->nextRangeScalar(domain.fLeft, SK_Scalar1); domain.fTop = random->nextUScalar1(); diff --git a/src/gpu/effects/GrTextureDomainEffect.h b/src/gpu/effects/GrTextureDomainEffect.h index 8b1f2b6f61..a4017c1881 100644 --- a/src/gpu/effects/GrTextureDomainEffect.h +++ b/src/gpu/effects/GrTextureDomainEffect.h @@ -9,9 +9,9 @@ #define GrTextureDomainEffect_DEFINED #include "GrSingleTextureEffect.h" -#include "GrRect.h" class GrGLTextureDomainEffect; +struct SkRect; /** * Limits a texture's lookup coordinates to a domain. Samples outside the domain are either clamped @@ -74,7 +74,7 @@ protected: private: GrTextureDomainEffect(GrTexture*, const SkMatrix&, - const GrRect& domain, + const SkRect& domain, WrapMode, bool bilerp, CoordsType type); |