From db4183d227b764b219e9e314dd5387ded4c38797 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Thu, 17 Nov 2016 12:48:40 -0500 Subject: In GrProcessor::TextureSampler drop the "get", it's cleaner GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4962 Change-Id: I55e7f8d1b6e1097fdbe411e9989dd42a03dd5f33 Reviewed-on: https://skia-review.googlesource.com/4962 Reviewed-by: Greg Daniel Commit-Queue: Brian Salomon --- src/gpu/effects/GrDistanceFieldGeoProc.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gpu/effects/GrDistanceFieldGeoProc.cpp') diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp index a99e2af018..8de6cd26a4 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp @@ -86,7 +86,7 @@ public: // compute numbers to be hardcoded to convert texture coordinates from float to int SkASSERT(dfTexEffect.numTextureSamplers() == 1); - GrTexture* atlas = dfTexEffect.textureSampler(0).getTexture(); + GrTexture* atlas = dfTexEffect.textureSampler(0).texture(); SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height())); GrGLSLVertToFrag st(kVec2f_GrSLType); @@ -208,7 +208,7 @@ public: // Currently we hardcode numbers to convert atlas coordinates to normalized floating point SkASSERT(gp.numTextureSamplers() == 1); - GrTexture* atlas = gp.textureSampler(0).getTexture(); + GrTexture* atlas = gp.textureSampler(0).texture(); SkASSERT(atlas); b->add32(atlas->width()); b->add32(atlas->height()); @@ -433,7 +433,7 @@ public: FPCoordTransformIter&& transformIter) override { SkASSERT(fTextureSizeUni.isValid()); - GrTexture* texture = proc.textureSampler(0).getTexture(); + GrTexture* texture = proc.textureSampler(0).texture(); if (texture->width() != fTextureSize.width() || texture->height() != fTextureSize.height()) { fTextureSize = SkISize::Make(texture->width(), texture->height()); @@ -595,7 +595,7 @@ public: // compute numbers to be hardcoded to convert texture coordinates from float to int SkASSERT(dfTexEffect.numTextureSamplers() == 1); - GrTexture* atlas = dfTexEffect.textureSampler(0).getTexture(); + GrTexture* atlas = dfTexEffect.textureSampler(0).texture(); SkASSERT(atlas && SkIsPow2(atlas->width()) && SkIsPow2(atlas->height())); GrGLSLVertToFrag st(kVec2f_GrSLType); @@ -761,7 +761,7 @@ public: // Currently we hardcode numbers to convert atlas coordinates to normalized floating point SkASSERT(gp.numTextureSamplers() == 1); - GrTexture* atlas = gp.textureSampler(0).getTexture(); + GrTexture* atlas = gp.textureSampler(0).texture(); SkASSERT(atlas); b->add32(atlas->width()); b->add32(atlas->height()); -- cgit v1.2.3