Index: src/gpu/effects/GrRRectEffect.cpp |
diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/effects/GrRRectEffect.cpp |
index 84e49cb0590c53e1e1eeb65c1fa92a77a7471936..a91b8f131d4db2211dbf0a57e30a11b14c542ce8 100644 |
--- a/src/gpu/effects/GrRRectEffect.cpp |
+++ b/src/gpu/effects/GrRRectEffect.cpp |
@@ -156,12 +156,12 @@ void GLCircularRRectEffect::emitCode(EmitArgs& args) { |
// edges correspond to components x, y, z, and w, respectively. When a side of the rrect has |
// only rectangular corners, that side's value corresponds to the rect edge's value outset by |
// half a pixel. |
- fInnerRectUniform = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, |
+ fInnerRectUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, |
kVec4f_GrSLType, kDefault_GrSLPrecision, |
"innerRect", |
&rectName); |
// x is (r + .5) and y is 1/(r + .5) |
- fRadiusPlusHalfUniform = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, |
+ fRadiusPlusHalfUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, |
kVec2f_GrSLType, kDefault_GrSLPrecision, |
"radiusPlusHalf", |
&radiusPlusHalfName); |
@@ -508,7 +508,7 @@ void GLEllipticalRRectEffect::emitCode(EmitArgs& args) { |
GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; |
const char *rectName; |
// The inner rect is the rrect bounds inset by the x/y radii |
- fInnerRectUniform = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, |
+ fInnerRectUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, |
kVec4f_GrSLType, kDefault_GrSLPrecision, |
"innerRect", |
&rectName); |
@@ -535,7 +535,7 @@ void GLEllipticalRRectEffect::emitCode(EmitArgs& args) { |
// radii uniform values are already in this normalized space. |
const char* scaleName = nullptr; |
if (args.fGLSLCaps->floatPrecisionVaries()) { |
- fScaleUniform = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, |
+ fScaleUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, |
kVec2f_GrSLType, kDefault_GrSLPrecision, |
"scale", &scaleName); |
} |
@@ -544,11 +544,11 @@ void GLEllipticalRRectEffect::emitCode(EmitArgs& args) { |
switch (erre.getRRect().getType()) { |
case SkRRect::kSimple_Type: { |
const char *invRadiiXYSqdName; |
- fInvRadiiSqdUniform = uniformHandler->addUniform( |
- GrGLSLUniformHandler::kFragment_Visibility, |
- kVec2f_GrSLType, kDefault_GrSLPrecision, |
- "invRadiiXY", |
- &invRadiiXYSqdName); |
+ fInvRadiiSqdUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, |
+ kVec2f_GrSLType, |
+ kDefault_GrSLPrecision, |
+ "invRadiiXY", |
+ &invRadiiXYSqdName); |
fragBuilder->codeAppend("vec2 dxy = max(max(dxy0, dxy1), 0.0);"); |
if (scaleName) { |
fragBuilder->codeAppendf("dxy *= %s.y;", scaleName); |
@@ -559,11 +559,11 @@ void GLEllipticalRRectEffect::emitCode(EmitArgs& args) { |
} |
case SkRRect::kNinePatch_Type: { |
const char *invRadiiLTRBSqdName; |
- fInvRadiiSqdUniform = uniformHandler->addUniform( |
- GrGLSLUniformHandler::kFragment_Visibility, |
- kVec4f_GrSLType, kDefault_GrSLPrecision, |
- "invRadiiLTRB", |
- &invRadiiLTRBSqdName); |
+ fInvRadiiSqdUniform = uniformHandler->addUniform(kFragment_GrShaderFlag, |
+ kVec4f_GrSLType, |
+ kDefault_GrSLPrecision, |
+ "invRadiiLTRB", |
+ &invRadiiLTRBSqdName); |
if (scaleName) { |
fragBuilder->codeAppendf("dxy0 *= %s.y;", scaleName); |
fragBuilder->codeAppendf("dxy1 *= %s.y;", scaleName); |