diff options
| author |  Brian Salomon <bsalomon@google.com> | 2016-11-17 11:38:22 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-17 17:18:53 +0000 |
| commit | 0bbecb21ab82b3d742c491780bcc2e74be03efed (patch) | |
| tree | 0355eca170a7cb268b27049dd158886d7f62cb87 /src/gpu/effects/GrBitmapTextGeoProc.cpp | |
| parent | 9de097639f04e5a18da2d2b123dace9d24ab50e4 (diff) | |
Rename GrTextureAccess to GrProcessor::TextureSampler.
Renames vars and methods that used the work "access" to refer to this type.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4931
Change-Id: Ibcf488fbd445c5119fc13d190544cd98981bdbee
Reviewed-on: https://skia-review.googlesource.com/4931
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/effects/GrBitmapTextGeoProc.cpp')
| -rw-r--r-- | src/gpu/effects/GrBitmapTextGeoProc.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp index 197ac730b2..889a085d82 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp @@ -30,8 +30,8 @@ public: varyingHandler->emitAttributes(cte); // compute numbers to be hardcoded to convert texture coordinates from int to float - SkASSERT(cte.numTextures() == 1); - SkDEBUGCODE(GrTexture* atlas = cte.textureAccess(0).getTexture()); + SkASSERT(cte.numTextureSamplers() == 1); + SkDEBUGCODE(GrTexture* atlas = cte.textureSampler(0).getTexture()); SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height())); GrGLSLVertToFrag v(kVec2f_GrSLType); @@ -108,8 +108,8 @@ public: b->add32(key); // Currently we hardcode numbers to convert atlas coordinates to normalized floating point - SkASSERT(gp.numTextures() == 1); - GrTexture* atlas = gp.textureAccess(0).getTexture(); + SkASSERT(gp.numTextureSamplers() == 1); + GrTexture* atlas = gp.textureSampler(0).getTexture(); SkASSERT(atlas); b->add32(atlas->width()); b->add32(atlas->height()); @@ -130,7 +130,7 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture, : fColor(color) , fLocalMatrix(localMatrix) , fUsesLocalCoords(usesLocalCoords) - , fTextureAccess(texture, params) + , fTextureSampler(texture, params) , fInColor(nullptr) , fMaskFormat(format) { this->initClassID<GrBitmapTextGeoProc>(); @@ -143,7 +143,7 @@ GrBitmapTextGeoProc::GrBitmapTextGeoProc(GrColor color, GrTexture* texture, } fInTextureCoords = &this->addVertexAttrib("inTextureCoords", kVec2us_GrVertexAttribType, kHigh_GrSLPrecision); - this->addTextureAccess(&fTextureAccess); + this->addTextureSampler(&fTextureSampler); } void GrBitmapTextGeoProc::getGLSLProcessorKey(const GrGLSLCaps& caps, |