src/gpu/effects/GrDistanceFieldTextureEffect.cpp - Issue 365853002: Rename GrGLUniformManager to GrGLProgramResourceManager

Unified Diff: src/gpu/effects/GrDistanceFieldTextureEffect.cpp

Issue 365853002: Rename GrGLUniformManager to GrGLProgramResourceManager (Closed) Base URL: https://skia.googlesource.com/skia.git@02-path-program-fragment

Patch Set: rebase Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/gpu/effects/GrDistanceFieldTextureEffect.cpp

diff --git a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp

index 0c0c1afc769ac15f2355e85c46deb83427b19c20..fcd24f7e5b51309dfa0bb2bc9795d06b6d6071bb 100755

--- a/src/gpu/effects/GrDistanceFieldTextureEffect.cpp

+++ b/src/gpu/effects/GrDistanceFieldTextureEffect.cpp

@@ -125,7 +125,7 @@ public:

(GrGLSLExpr4(inputColor) * GrGLSLExpr1("val")).c_str());

}

- virtual void setData(const GrGLUniformManager& uman,

+ virtual void setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) SK_OVERRIDE {

SkASSERT(fTextureSizeUni.isValid());

@@ -133,7 +133,7 @@ public:

if (texture->width() != fTextureSize.width() ||

texture->height() != fTextureSize.height()) {

fTextureSize = SkISize::Make(texture->width(), texture->height());

- uman.set2f(fTextureSizeUni,

+ prman.set2f(fTextureSizeUni,

SkIntToScalar(fTextureSize.width()),

SkIntToScalar(fTextureSize.height()));

}

@@ -142,7 +142,7 @@ public:

drawEffect.castEffect<GrDistanceFieldTextureEffect>();

float luminance = dfTexEffect.getLuminance();

if (luminance != fLuminance) {

- uman.set1f(fLuminanceUni, luminance);

+ prman.set1f(fLuminanceUni, luminance);

fLuminance = luminance;

}

#endif

@@ -157,9 +157,9 @@ public:

}

private:

- GrGLUniformManager::UniformHandle fTextureSizeUni;

+ GrGLProgramResourceManager::UniformHandle fTextureSizeUni;

bsalomon 2014/07/29 13:08:17 align

SkISize fTextureSize;

- GrGLUniformManager::UniformHandle fLuminanceUni;

+ GrGLProgramResourceManager::UniformHandle fLuminanceUni;

float fLuminance;

typedef GrGLVertexEffect INHERITED;

@@ -381,7 +381,7 @@ public:

(GrGLSLExpr4(inputColor) * GrGLSLExpr4("val")).c_str());

}

- virtual void setData(const GrGLUniformManager& uman,

+ virtual void setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) SK_OVERRIDE {

SkASSERT(fTextureSizeUni.isValid());

SkASSERT(fTextColorUni.isValid());

@@ -396,7 +396,7 @@ public:

if (dfTexEffect.useBGR()) {

delta = -delta;

}

- uman.set3f(fTextureSizeUni,

+ prman.set3f(fTextureSizeUni,

SkIntToScalar(fTextureSize.width()),

SkIntToScalar(fTextureSize.height()),

delta);

@@ -405,7 +405,7 @@ public:

GrColor textColor = dfTexEffect.getTextColor();

if (textColor != fTextColor) {

static const float ONE_OVER_255 = 1.f / 255.f;

- uman.set3f(fTextColorUni,

+ prman.set3f(fTextColorUni,

GrColorUnpackR(textColor) * ONE_OVER_255,

GrColorUnpackG(textColor) * ONE_OVER_255,

GrColorUnpackB(textColor) * ONE_OVER_255);

@@ -422,9 +422,9 @@ public:

}

private:

- GrGLUniformManager::UniformHandle fTextureSizeUni;

+ GrGLProgramResourceManager::UniformHandle fTextureSizeUni;

bsalomon 2014/07/29 13:08:17 align

SkISize fTextureSize;

- GrGLUniformManager::UniformHandle fTextColorUni;

+ GrGLProgramResourceManager::UniformHandle fTextColorUni;

SkColor fTextColor;

typedef GrGLVertexEffect INHERITED;

« src/gpu/effects/GrDashingEffect.cpp ('K') | « src/gpu/effects/GrDashingEffect.cpp ('k') | src/gpu/effects/GrMatrixConvolutionEffect.cpp » ('j') | src/gpu/effects/GrRRectEffect.cpp » ('J')