src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp - Issue 365853002: Rename GrGLUniformManager to GrGLProgramResourceManager

Unified Diff: src/effects/gradients/SkTwoPointConicalGradient_gpu.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

« src/effects/SkPerlinNoiseShader.cpp ('K') | « src/effects/gradients/SkGradientShaderPriv.h ('k') | src/effects/gradients/SkTwoPointRadialGradient.cpp » ('j') | src/gpu/effects/GrDashingEffect.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

index 76f9a492b8ee5f75c1dfb60b58d9d4b1eed44f24..ebc6d84e93830f5d214a57ef49f2d70f3b055a2e 100644

--- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

+++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

@@ -14,7 +14,7 @@

#include "GrTBackendEffectFactory.h"

#include "gl/GrGLShaderBuilder.h"

// For brevity

-typedef GrGLUniformManager::UniformHandle UniformHandle;

+typedef GrGLProgramResourceManager::UniformHandle UniformHandle;

static const SkScalar kErrorTol = 0.00001f;

static const SkScalar kEdgeErrorTol = 5.f * kErrorTol;

@@ -144,7 +144,7 @@ public:

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray&) SK_OVERRIDE;

- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;

+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE;

static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);

@@ -273,9 +273,9 @@ void GLEdge2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,

builder->fsCodeAppend("\t}\n");

}

-void GLEdge2PtConicalEffect::setData(const GrGLUniformManager& uman,

+void GLEdge2PtConicalEffect::setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) {

- INHERITED::setData(uman, drawEffect);

+ INHERITED::setData(prman, drawEffect);

const Edge2PtConicalEffect& data = drawEffect.castEffect<Edge2PtConicalEffect>();

SkScalar radius0 = data.radius();

SkScalar diffRadius = data.diffRadius();

@@ -289,7 +289,7 @@ void GLEdge2PtConicalEffect::setData(const GrGLUniformManager& uman,

SkScalarToFloat(diffRadius)

};

- uman.set1fv(fParamUni, 3, values);

+ prman.set1fv(fParamUni, 3, values);

fCachedRadius = radius0;

fCachedDiffRadius = diffRadius;

}

@@ -420,7 +420,7 @@ public:

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray&) SK_OVERRIDE;

- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;

+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE;

static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);

@@ -541,9 +541,9 @@ void GLFocalOutside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,

builder->fsCodeAppend("\t}\n");

}

-void GLFocalOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,

+void GLFocalOutside2PtConicalEffect::setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) {

- INHERITED::setData(uman, drawEffect);

+ INHERITED::setData(prman, drawEffect);

const FocalOutside2PtConicalEffect& data = drawEffect.castEffect<FocalOutside2PtConicalEffect>();

SkASSERT(data.isFlipped() == fIsFlipped);

SkScalar focal = data.focal();

@@ -556,7 +556,7 @@ void GLFocalOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,

SkScalarToFloat(oneMinus2F),

};

- uman.set1fv(fParamUni, 2, values);

+ prman.set1fv(fParamUni, 2, values);

fCachedFocal = focal;

}

@@ -625,7 +625,7 @@ public:

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray&) SK_OVERRIDE;

- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;

+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE;

static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);

@@ -723,14 +723,14 @@ void GLFocalInside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,

this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);

}

-void GLFocalInside2PtConicalEffect::setData(const GrGLUniformManager& uman,

+void GLFocalInside2PtConicalEffect::setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) {

- INHERITED::setData(uman, drawEffect);

+ INHERITED::setData(prman, drawEffect);

const FocalInside2PtConicalEffect& data = drawEffect.castEffect<FocalInside2PtConicalEffect>();

SkScalar focal = data.focal();

if (fCachedFocal != focal) {

- uman.set1f(fFocalUni, SkScalarToFloat(focal));

+ prman.set1f(fFocalUni, SkScalarToFloat(focal));

fCachedFocal = focal;

}

@@ -866,7 +866,7 @@ public:

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray&) SK_OVERRIDE;

- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;

+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE;

static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);

@@ -985,9 +985,9 @@ void GLCircleInside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,

this->emitColor(builder, tName.c_str(), baseKey, outputColor, inputColor, samplers);

}

-void GLCircleInside2PtConicalEffect::setData(const GrGLUniformManager& uman,

+void GLCircleInside2PtConicalEffect::setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) {

- INHERITED::setData(uman, drawEffect);

+ INHERITED::setData(prman, drawEffect);

const CircleInside2PtConicalEffect& data = drawEffect.castEffect<CircleInside2PtConicalEffect>();

SkScalar centerX = data.centerX();

SkScalar centerY = data.centerY();

@@ -998,8 +998,8 @@ void GLCircleInside2PtConicalEffect::setData(const GrGLUniformManager& uman,

if (fCachedCenterX != centerX || fCachedCenterY != centerY ||

fCachedA != A || fCachedB != B || fCachedC != C) {

- uman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));

- uman.set3f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C));

+ prman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));

+ prman.set3f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C));

fCachedCenterX = centerX;

fCachedCenterY = centerY;

@@ -1092,7 +1092,7 @@ public:

const char* inputColor,

const TransformedCoordsArray&,

const TextureSamplerArray&) SK_OVERRIDE;

- virtual void setData(const GrGLUniformManager&, const GrDrawEffect&) SK_OVERRIDE;

+ virtual void setData(const GrGLProgramResourceManager&, const GrDrawEffect&) SK_OVERRIDE;

static void GenKey(const GrDrawEffect&, const GrGLCaps& caps, GrEffectKeyBuilder* b);

@@ -1234,9 +1234,9 @@ void GLCircleOutside2PtConicalEffect::emitCode(GrGLShaderBuilder* builder,

builder->fsCodeAppend("\t}\n");

}

-void GLCircleOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,

+void GLCircleOutside2PtConicalEffect::setData(const GrGLProgramResourceManager& prman,

const GrDrawEffect& drawEffect) {

- INHERITED::setData(uman, drawEffect);

+ INHERITED::setData(prman, drawEffect);

const CircleOutside2PtConicalEffect& data = drawEffect.castEffect<CircleOutside2PtConicalEffect>();

SkASSERT(data.isFlipped() == fIsFlipped);

SkScalar centerX = data.centerX();

@@ -1249,8 +1249,8 @@ void GLCircleOutside2PtConicalEffect::setData(const GrGLUniformManager& uman,

if (fCachedCenterX != centerX || fCachedCenterY != centerY ||

fCachedA != A || fCachedB != B || fCachedC != C || fCachedTLimit != tLimit) {

- uman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));

- uman.set4f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C),

+ prman.set2f(fCenterUni, SkScalarToFloat(centerX), SkScalarToFloat(centerY));

+ prman.set4f(fParamUni, SkScalarToFloat(A), SkScalarToFloat(B), SkScalarToFloat(C),

SkScalarToFloat(tLimit));

fCachedCenterX = centerX;