rename atlassize->atlasdimensions
Change-Id: I0262ed26f0b3523302bbb4e94dfca94d120fc70c
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/249980
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/ccpr/GrCCPathProcessor.cpp b/src/gpu/ccpr/GrCCPathProcessor.cpp
index 07065f5..1244953 100644
--- a/src/gpu/ccpr/GrCCPathProcessor.cpp
+++ b/src/gpu/ccpr/GrCCPathProcessor.cpp
@@ -85,7 +85,7 @@
: INHERITED(kGrCCPathProcessor_ClassID)
, fCoverageMode(coverageMode)
, fAtlasAccess(GrSamplerState::ClampNearest(), atlasTexture->backendFormat(), swizzle)
- , fAtlasSize(SkISize::Make(atlasTexture->width(), atlasTexture->height()))
+ , fAtlasDimensions(atlasTexture->dimensions())
, fAtlasOrigin(atlasOrigin) {
// TODO: Can we just assert that atlas has GrCCAtlas::kTextureOrigin and remove fAtlasOrigin?
this->setInstanceAttributes(kInstanceAttribs, SK_ARRAY_COUNT(kInstanceAttribs));
@@ -107,8 +107,9 @@
void setData(const GrGLSLProgramDataManager& pdman, const GrPrimitiveProcessor& primProc,
FPCoordTransformIter&& transformIter) override {
const auto& proc = primProc.cast<GrCCPathProcessor>();
- pdman.set2f(
- fAtlasAdjustUniform, 1.0f / proc.fAtlasSize.fWidth, 1.0f / proc.fAtlasSize.fHeight);
+ pdman.set2f(fAtlasAdjustUniform,
+ 1.0f / proc.fAtlasDimensions.fWidth,
+ 1.0f / proc.fAtlasDimensions.fHeight);
this->setTransformDataHelper(proc.fLocalMatrix, pdman, &transformIter);
}
diff --git a/src/gpu/ccpr/GrCCPathProcessor.h b/src/gpu/ccpr/GrCCPathProcessor.h
index 6ad8720..7fcb256 100644
--- a/src/gpu/ccpr/GrCCPathProcessor.h
+++ b/src/gpu/ccpr/GrCCPathProcessor.h
@@ -80,7 +80,7 @@
const CoverageMode fCoverageMode;
const TextureSampler fAtlasAccess;
- SkISize fAtlasSize;
+ SkISize fAtlasDimensions;
GrSurfaceOrigin fAtlasOrigin;
SkMatrix fLocalMatrix;
diff --git a/src/gpu/effects/GrAtlasedShaderHelpers.h b/src/gpu/effects/GrAtlasedShaderHelpers.h
index 94b6f98..cf615b3 100644
--- a/src/gpu/effects/GrAtlasedShaderHelpers.h
+++ b/src/gpu/effects/GrAtlasedShaderHelpers.h
@@ -16,10 +16,10 @@
static void append_index_uv_varyings(GrGLSLPrimitiveProcessor::EmitArgs& args,
const char* inTexCoordsName,
- const char* atlasSizeInvName,
- GrGLSLVarying *uv,
- GrGLSLVarying *texIdx,
- GrGLSLVarying *st) {
+ const char* atlasDimensionsInvName,
+ GrGLSLVarying* uv,
+ GrGLSLVarying* texIdx,
+ GrGLSLVarying* st) {
using Interpolation = GrGLSLVaryingHandler::Interpolation;
// This extracts the texture index and texel coordinates from the same variable
@@ -38,9 +38,10 @@
args.fVertBuilder->codeAppend("float texIdx = 2.0*diff.x + diff.y;");
}
- // Multiply by 1/atlasSize to get normalized texture coordinates
+ // Multiply by 1/atlasDimensions to get normalized texture coordinates
args.fVaryingHandler->addVarying("TextureCoords", uv);
- args.fVertBuilder->codeAppendf("%s = unormTexCoords * %s;", uv->vsOut(), atlasSizeInvName);
+ args.fVertBuilder->codeAppendf("%s = unormTexCoords * %s;", uv->vsOut(),
+ atlasDimensionsInvName);
args.fVaryingHandler->addVarying("TexIndex", texIdx, args.fShaderCaps->integerSupport()
? Interpolation::kMustBeFlat
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/effects/GrBitmapTextGeoProc.cpp
index c58eb82..67adfc5 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.cpp
+++ b/src/gpu/effects/GrBitmapTextGeoProc.cpp
@@ -20,7 +20,7 @@
class GrGLBitmapTextGeoProc : public GrGLSLGeometryProcessor {
public:
- GrGLBitmapTextGeoProc() : fColor(SK_PMColor4fILLEGAL), fAtlasSize({0,0}) {}
+ GrGLBitmapTextGeoProc() : fColor(SK_PMColor4fILLEGAL), fAtlasDimensions{0,0} {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override {
const GrBitmapTextGeoProc& btgp = args.fGP.cast<GrBitmapTextGeoProc>();
@@ -32,16 +32,14 @@
// emit attributes
varyingHandler->emitAttributes(btgp);
- const char* atlasSizeInvName;
- fAtlasSizeInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
- kFloat2_GrSLType,
- "AtlasSizeInv",
- &atlasSizeInvName);
+ const char* atlasDimensionsInvName;
+ fAtlasDimensionsInvUniform = uniformHandler->addUniform(
+ kVertex_GrShaderFlag, kFloat2_GrSLType, "AtlasSizeInv", &atlasDimensionsInvName);
GrGLSLVarying uv(kFloat2_GrSLType);
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
- append_index_uv_varyings(args, btgp.inTextureCoords().name(), atlasSizeInvName, &uv,
+ append_index_uv_varyings(args, btgp.inTextureCoords().name(), atlasDimensionsInvName, &uv,
&texIdx, nullptr);
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
@@ -85,12 +83,14 @@
fColor = btgp.color();
}
- const SkISize& atlasSize = btgp.atlasSize();
- SkASSERT(SkIsPow2(atlasSize.fWidth) && SkIsPow2(atlasSize.fHeight));
+ const SkISize& atlasDimensions = btgp.atlasDimensions();
+ SkASSERT(SkIsPow2(atlasDimensions.fWidth) && SkIsPow2(atlasDimensions.fHeight));
- if (fAtlasSize != atlasSize) {
- pdman.set2f(fAtlasSizeInvUniform, 1.0f / atlasSize.fWidth, 1.0f / atlasSize.fHeight);
- fAtlasSize = atlasSize;
+ if (fAtlasDimensions != atlasDimensions) {
+ pdman.set2f(fAtlasDimensionsInvUniform,
+ 1.0f / atlasDimensions.fWidth,
+ 1.0f / atlasDimensions.fHeight);
+ fAtlasDimensions = atlasDimensions;
}
this->setTransformDataHelper(btgp.localMatrix(), pdman, &transformIter);
}
@@ -110,8 +110,8 @@
SkPMColor4f fColor;
UniformHandle fColorUniform;
- SkISize fAtlasSize;
- UniformHandle fAtlasSizeInvUniform;
+ SkISize fAtlasDimensions;
+ UniformHandle fAtlasDimensionsInvUniform;
typedef GrGLSLGeometryProcessor INHERITED;
};
@@ -149,11 +149,11 @@
this->setVertexAttributes(&fInPosition, 3);
if (numActiveProxies) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numActiveProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
proxies[i]->textureSwizzle());
}
@@ -166,12 +166,12 @@
SkASSERT(numActiveProxies <= kMaxTextures);
if (!fTextureSamplers[0].isInitialized()) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numActiveProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
if (!fTextureSamplers[i].isInitialized()) {
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/effects/GrBitmapTextGeoProc.h
index 3c29c4a..9a6096b 100644
--- a/src/gpu/effects/GrBitmapTextGeoProc.h
+++ b/src/gpu/effects/GrBitmapTextGeoProc.h
@@ -46,7 +46,7 @@
bool hasVertexColor() const { return fInColor.isInitialized(); }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
bool usesW() const { return fUsesW; }
- const SkISize& atlasSize() const { return fAtlasSize; }
+ const SkISize& atlasDimensions() const { return fAtlasDimensions; }
void addNewProxies(const sk_sp<GrTextureProxy>*, int numActiveProxies, const GrSamplerState&);
@@ -65,7 +65,7 @@
SkPMColor4f fColor;
SkMatrix fLocalMatrix;
bool fUsesW;
- SkISize fAtlasSize; // size for all textures used with fTextureSamplers[].
+ SkISize fAtlasDimensions; // dimensions for all textures used with fTextureSamplers[].
TextureSampler fTextureSamplers[kMaxTextures];
Attribute fInPosition;
Attribute fInColor;
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
index 50ddb47..50b40aa 100644
--- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.cpp
@@ -38,11 +38,11 @@
// emit attributes
varyingHandler->emitAttributes(dfTexEffect);
- const char* atlasSizeInvName;
- fAtlasSizeInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
- kFloat2_GrSLType,
- "AtlasSizeInv",
- &atlasSizeInvName);
+ const char* atlasDimensionsInvName;
+ fAtlasDimensionsInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
+ kFloat2_GrSLType,
+ "AtlasDimensionsInv",
+ &atlasDimensionsInvName);
#ifdef SK_GAMMA_APPLY_TO_A8
// adjust based on gamma
const char* distanceAdjustUniName = nullptr;
@@ -70,8 +70,8 @@
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
GrGLSLVarying st(kFloat2_GrSLType);
- append_index_uv_varyings(args, dfTexEffect.inTextureCoords().name(), atlasSizeInvName, &uv,
- &texIdx, &st);
+ append_index_uv_varyings(args, dfTexEffect.inTextureCoords().name(), atlasDimensionsInvName,
+ &uv, &texIdx, &st);
bool isUniformScale = (dfTexEffect.getFlags() & kUniformScale_DistanceFieldEffectMask) ==
kUniformScale_DistanceFieldEffectMask;
@@ -174,12 +174,14 @@
}
#endif
- const SkISize& atlasSize = dfa8gp.atlasSize();
- SkASSERT(SkIsPow2(atlasSize.fWidth) && SkIsPow2(atlasSize.fHeight));
+ const SkISize& atlasDimensions = dfa8gp.atlasDimensions();
+ SkASSERT(SkIsPow2(atlasDimensions.fWidth) && SkIsPow2(atlasDimensions.fHeight));
- if (fAtlasSize != atlasSize) {
- pdman.set2f(fAtlasSizeInvUniform, 1.0f / atlasSize.fWidth, 1.0f / atlasSize.fHeight);
- fAtlasSize = atlasSize;
+ if (fAtlasDimensions != atlasDimensions) {
+ pdman.set2f(fAtlasDimensionsInvUniform,
+ 1.0f / atlasDimensions.fWidth,
+ 1.0f / atlasDimensions.fHeight);
+ fAtlasDimensions = atlasDimensions;
}
this->setTransformDataHelper(dfa8gp.localMatrix(), pdman, &transformIter);
}
@@ -198,8 +200,8 @@
float fDistanceAdjust = -1.f;
UniformHandle fDistanceAdjustUni;
#endif
- SkISize fAtlasSize = {0, 0};
- UniformHandle fAtlasSizeInvUniform;
+ SkISize fAtlasDimensions = {0, 0};
+ UniformHandle fAtlasDimensionsInvUniform;
typedef GrGLSLGeometryProcessor INHERITED;
};
@@ -236,11 +238,11 @@
this->setVertexAttributes(&fInPosition, 3);
if (numProxies) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
proxies[i]->textureSwizzle());
}
@@ -253,12 +255,12 @@
SkASSERT(numProxies <= kMaxTextures);
if (!fTextureSamplers[0].isInitialized()) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
if (!fTextureSamplers[i].isInitialized()) {
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
proxies[i]->textureSwizzle());
@@ -321,10 +323,7 @@
class GrGLDistanceFieldPathGeoProc : public GrGLSLGeometryProcessor {
public:
- GrGLDistanceFieldPathGeoProc()
- : fMatrix(SkMatrix::InvalidMatrix())
- , fAtlasSize({0,0}) {
- }
+ GrGLDistanceFieldPathGeoProc() : fMatrix(SkMatrix::InvalidMatrix()), fAtlasDimensions{0,0} {}
void onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) override{
const GrDistanceFieldPathGeoProc& dfPathEffect =
@@ -339,18 +338,18 @@
// emit attributes
varyingHandler->emitAttributes(dfPathEffect);
- const char* atlasSizeInvName;
- fAtlasSizeInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
- kFloat2_GrSLType,
- "AtlasSizeInv",
- &atlasSizeInvName);
+ const char* atlasDimensionsInvName;
+ fAtlasDimensionsInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
+ kFloat2_GrSLType,
+ "AtlasDimensionsInv",
+ &atlasDimensionsInvName);
GrGLSLVarying uv(kFloat2_GrSLType);
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
GrGLSLVarying st(kFloat2_GrSLType);
- append_index_uv_varyings(args, dfPathEffect.inTextureCoords().name(), atlasSizeInvName, &uv,
- &texIdx, &st);
+ append_index_uv_varyings(args, dfPathEffect.inTextureCoords().name(),
+ atlasDimensionsInvName, &uv, &texIdx, &st);
// setup pass through color
varyingHandler->addPassThroughAttribute(dfPathEffect.inColor(), args.fOutputColor);
@@ -473,11 +472,13 @@
pdman.setMatrix3f(fMatrixUniform, matrix);
}
- const SkISize& atlasSize = dfpgp.atlasSize();
- SkASSERT(SkIsPow2(atlasSize.fWidth) && SkIsPow2(atlasSize.fHeight));
- if (fAtlasSize != atlasSize) {
- pdman.set2f(fAtlasSizeInvUniform, 1.0f / atlasSize.fWidth, 1.0f / atlasSize.fHeight);
- fAtlasSize = atlasSize;
+ const SkISize& atlasDimensions = dfpgp.atlasDimensions();
+ SkASSERT(SkIsPow2(atlasDimensions.fWidth) && SkIsPow2(atlasDimensions.fHeight));
+ if (fAtlasDimensions != atlasDimensions) {
+ pdman.set2f(fAtlasDimensionsInvUniform,
+ 1.0f / atlasDimensions.fWidth,
+ 1.0f / atlasDimensions.fHeight);
+ fAtlasDimensions = atlasDimensions;
}
if (dfpgp.matrix().hasPerspective()) {
@@ -503,8 +504,8 @@
SkMatrix fMatrix; // view matrix if perspective, local matrix otherwise
UniformHandle fMatrixUniform;
- SkISize fAtlasSize;
- UniformHandle fAtlasSizeInvUniform;
+ SkISize fAtlasDimensions;
+ UniformHandle fAtlasDimensionsInvUniform;
typedef GrGLSLGeometryProcessor INHERITED;
};
@@ -531,12 +532,12 @@
this->setVertexAttributes(&fInPosition, 3);
if (numProxies) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
proxies[i]->textureSwizzle());
}
@@ -549,12 +550,12 @@
SkASSERT(numProxies <= kMaxTextures);
if (!fTextureSamplers[0].isInitialized()) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
if (!fTextureSamplers[i].isInitialized()) {
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
@@ -614,7 +615,7 @@
class GrGLDistanceFieldLCDTextGeoProc : public GrGLSLGeometryProcessor {
public:
- GrGLDistanceFieldLCDTextGeoProc() : fAtlasSize({0, 0}) {
+ GrGLDistanceFieldLCDTextGeoProc() : fAtlasDimensions({0, 0}) {
fDistanceAdjust = GrDistanceFieldLCDTextGeoProc::DistanceAdjust::Make(1.0f, 1.0f, 1.0f);
}
@@ -629,11 +630,11 @@
// emit attributes
varyingHandler->emitAttributes(dfTexEffect);
- const char* atlasSizeInvName;
- fAtlasSizeInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
- kFloat2_GrSLType,
- "AtlasSizeInv",
- &atlasSizeInvName);
+ const char* atlasDimensionsInvName;
+ fAtlasDimensionsInvUniform = uniformHandler->addUniform(kVertex_GrShaderFlag,
+ kFloat2_GrSLType,
+ "AtlasDimensionsInv",
+ &atlasDimensionsInvName);
GrGLSLFPFragmentBuilder* fragBuilder = args.fFragBuilder;
@@ -656,15 +657,15 @@
GrSLType texIdxType = args.fShaderCaps->integerSupport() ? kInt_GrSLType : kFloat_GrSLType;
GrGLSLVarying texIdx(texIdxType);
GrGLSLVarying st(kFloat2_GrSLType);
- append_index_uv_varyings(args, dfTexEffect.inTextureCoords().name(), atlasSizeInvName, &uv,
- &texIdx, &st);
+ append_index_uv_varyings(args, dfTexEffect.inTextureCoords().name(), atlasDimensionsInvName,
+ &uv, &texIdx, &st);
GrGLSLVarying delta(kFloat_GrSLType);
varyingHandler->addVarying("Delta", &delta);
if (dfTexEffect.getFlags() & kBGR_DistanceFieldEffectFlag) {
- vertBuilder->codeAppendf("%s = -%s.x/3.0;", delta.vsOut(), atlasSizeInvName);
+ vertBuilder->codeAppendf("%s = -%s.x/3.0;", delta.vsOut(), atlasDimensionsInvName);
} else {
- vertBuilder->codeAppendf("%s = %s.x/3.0;", delta.vsOut(), atlasSizeInvName);
+ vertBuilder->codeAppendf("%s = %s.x/3.0;", delta.vsOut(), atlasDimensionsInvName);
}
// add frag shader code
@@ -799,11 +800,13 @@
fDistanceAdjust = wa;
}
- const SkISize& atlasSize = dflcd.atlasSize();
- SkASSERT(SkIsPow2(atlasSize.fWidth) && SkIsPow2(atlasSize.fHeight));
- if (fAtlasSize != atlasSize) {
- pdman.set2f(fAtlasSizeInvUniform, 1.0f / atlasSize.fWidth, 1.0f / atlasSize.fHeight);
- fAtlasSize = atlasSize;
+ const SkISize& atlasDimensions = dflcd.atlasDimensions();
+ SkASSERT(SkIsPow2(atlasDimensions.fWidth) && SkIsPow2(atlasDimensions.fHeight));
+ if (fAtlasDimensions != atlasDimensions) {
+ pdman.set2f(fAtlasDimensionsInvUniform,
+ 1.0f / atlasDimensions.fWidth,
+ 1.0f / atlasDimensions.fHeight);
+ fAtlasDimensions = atlasDimensions;
}
this->setTransformDataHelper(dflcd.localMatrix(), pdman, &transformIter);
}
@@ -822,8 +825,8 @@
GrDistanceFieldLCDTextGeoProc::DistanceAdjust fDistanceAdjust;
UniformHandle fDistanceAdjustUni;
- SkISize fAtlasSize;
- UniformHandle fAtlasSizeInvUniform;
+ SkISize fAtlasDimensions;
+ UniformHandle fAtlasDimensionsInvUniform;
typedef GrGLSLGeometryProcessor INHERITED;
};
@@ -855,12 +858,12 @@
this->setVertexAttributes(&fInPosition, 3);
if (numProxies) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
proxies[i]->textureSwizzle());
}
@@ -873,12 +876,12 @@
SkASSERT(numProxies <= kMaxTextures);
if (!fTextureSamplers[0].isInitialized()) {
- fAtlasSize = proxies[0]->dimensions();
+ fAtlasDimensions = proxies[0]->dimensions();
}
for (int i = 0; i < numProxies; ++i) {
SkASSERT(proxies[i]);
- SkASSERT(proxies[i]->dimensions() == fAtlasSize);
+ SkASSERT(proxies[i]->dimensions() == fAtlasDimensions);
if (!fTextureSamplers[i].isInitialized()) {
fTextureSamplers[i].reset(params, proxies[i]->backendFormat(),
diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/effects/GrDistanceFieldGeoProc.h
index 20bb626..f55ca40 100644
--- a/src/gpu/effects/GrDistanceFieldGeoProc.h
+++ b/src/gpu/effects/GrDistanceFieldGeoProc.h
@@ -88,7 +88,7 @@
float getDistanceAdjust() const { return fDistanceAdjust; }
#endif
uint32_t getFlags() const { return fFlags; }
- const SkISize& atlasSize() const { return fAtlasSize; }
+ const SkISize& atlasDimensions() const { return fAtlasDimensions; }
void addNewProxies(const sk_sp<GrTextureProxy>* proxies, int numProxies, const GrSamplerState&);
@@ -109,7 +109,7 @@
const TextureSampler& onTextureSampler(int i) const override { return fTextureSamplers[i]; }
TextureSampler fTextureSamplers[kMaxTextures];
- SkISize fAtlasSize; // size for all textures used with fTextureSamplers[].
+ SkISize fAtlasDimensions; // dimensions for all textures used with fTextureSamplers[].
SkMatrix fLocalMatrix;
Attribute fInPosition;
Attribute fInColor;
@@ -155,7 +155,7 @@
const Attribute& inTextureCoords() const { return fInTextureCoords; }
const SkMatrix& matrix() const { return fMatrix; }
uint32_t getFlags() const { return fFlags; }
- const SkISize& atlasSize() const { return fAtlasSize; }
+ const SkISize& atlasDimensions() const { return fAtlasDimensions; }
void addNewProxies(const sk_sp<GrTextureProxy>*, int numActiveProxies, const GrSamplerState&);
@@ -175,7 +175,7 @@
SkMatrix fMatrix; // view matrix if perspective, local matrix otherwise
TextureSampler fTextureSamplers[kMaxTextures];
- SkISize fAtlasSize; // size for all textures used with fTextureSamplers[].
+ SkISize fAtlasDimensions; // dimensions for all textures used with fTextureSamplers[].
Attribute fInPosition;
Attribute fInColor;
Attribute fInTextureCoords;
@@ -233,7 +233,7 @@
DistanceAdjust getDistanceAdjust() const { return fDistanceAdjust; }
uint32_t getFlags() const { return fFlags; }
const SkMatrix& localMatrix() const { return fLocalMatrix; }
- const SkISize& atlasSize() const { return fAtlasSize; }
+ const SkISize& atlasDimensions() const { return fAtlasDimensions; }
void addNewProxies(const sk_sp<GrTextureProxy>*, int numActiveProxies, const GrSamplerState&);
@@ -249,7 +249,7 @@
const TextureSampler& onTextureSampler(int i) const override { return fTextureSamplers[i]; }
TextureSampler fTextureSamplers[kMaxTextures];
- SkISize fAtlasSize; // size for all textures used with fTextureSamplers[].
+ SkISize fAtlasDimensions; // dimensions for all textures used with fTextureSamplers[].
const SkMatrix fLocalMatrix;
DistanceAdjust fDistanceAdjust;
Attribute fInPosition;
diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/text/GrAtlasManager.cpp
index 8fb2a97..89b488d 100644
--- a/src/gpu/text/GrAtlasManager.cpp
+++ b/src/gpu/text/GrAtlasManager.cpp
@@ -149,7 +149,7 @@
}
#endif
-void GrAtlasManager::setAtlasSizesToMinimum_ForTesting() {
+void GrAtlasManager::setAtlasDimensionsToMinimum_ForTesting() {
// Delete any old atlases.
// This should be safe to do as long as we are not in the middle of a flush.
for (int i = 0; i < kMaskFormatCount; i++) {
diff --git a/src/gpu/text/GrAtlasManager.h b/src/gpu/text/GrAtlasManager.h
index 1799d8d..9e4f1c7 100644
--- a/src/gpu/text/GrAtlasManager.h
+++ b/src/gpu/text/GrAtlasManager.h
@@ -115,7 +115,7 @@
void dump(GrContext* context) const;
#endif
- void setAtlasSizesToMinimum_ForTesting();
+ void setAtlasDimensionsToMinimum_ForTesting();
void setMaxPages_TestingOnly(uint32_t maxPages);
private:
diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp
index a9b2ff7..bcc7288 100644
--- a/tests/TextBlobCacheTest.cpp
+++ b/tests/TextBlobCacheTest.cpp
@@ -46,7 +46,7 @@
static const int kHeight = 768;
static void setup_always_evict_atlas(GrContext* context) {
- context->priv().getAtlasManager()->setAtlasSizesToMinimum_ForTesting();
+ context->priv().getAtlasManager()->setAtlasDimensionsToMinimum_ForTesting();
}
// This test hammers the GPU textblobcache and font atlas