src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp - Issue 1684063006: Add GrShaderFlags enum

Unified Diff: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

Issue 1684063006: Add GrShaderFlags enum (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Bit->Flag Created 4 years, 10 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

Index: src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp

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

index ac32e72c536e59772dc578f7f317194ce6b6c454..b89f88a3a6c018ee12fef2311c46ff23aeebd516 100644

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

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

@@ -227,7 +227,7 @@ void GLEdge2PtConicalEffect::emitCode(EmitArgs& args) {

const Edge2PtConicalEffect& ge = args.fFp.cast<Edge2PtConicalEffect>();

GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;

this->emitUniforms(uniformHandler, ge);

- fParamUni = uniformHandler->addUniformArray(GrGLSLUniformHandler::kFragment_Visibility,

+ fParamUni = uniformHandler->addUniformArray(kFragment_GrShaderFlag,

kFloat_GrSLType, kDefault_GrSLPrecision,

"Conical2FSParams", 3);

@@ -510,7 +510,7 @@ void GLFocalOutside2PtConicalEffect::emitCode(EmitArgs& args) {

const FocalOutside2PtConicalEffect& ge = args.fFp.cast<FocalOutside2PtConicalEffect>();

GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;

this->emitUniforms(uniformHandler, ge);

- fParamUni = uniformHandler->addUniformArray(GrGLSLUniformHandler::kFragment_Visibility,

+ fParamUni = uniformHandler->addUniformArray(kFragment_GrShaderFlag,

kFloat_GrSLType, kDefault_GrSLPrecision,

"Conical2FSParams", 2);

SkString tName("t");

@@ -720,7 +720,7 @@ void GLFocalInside2PtConicalEffect::emitCode(EmitArgs& args) {

const FocalInside2PtConicalEffect& ge = args.fFp.cast<FocalInside2PtConicalEffect>();

GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;

this->emitUniforms(uniformHandler, ge);

- fFocalUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility,

+ fFocalUni = uniformHandler->addUniform(kFragment_GrShaderFlag,

kFloat_GrSLType, kDefault_GrSLPrecision,

"Conical2FSParams");

SkString tName("t");

@@ -972,10 +972,10 @@ void GLCircleInside2PtConicalEffect::emitCode(EmitArgs& args) {

const CircleInside2PtConicalEffect& ge = args.fFp.cast<CircleInside2PtConicalEffect>();

GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;

this->emitUniforms(uniformHandler, ge);

- fCenterUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility,

+ fCenterUni = uniformHandler->addUniform(kFragment_GrShaderFlag,

kVec2f_GrSLType, kDefault_GrSLPrecision,

"Conical2FSCenter");

- fParamUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility,

+ fParamUni = uniformHandler->addUniform(kFragment_GrShaderFlag,

kVec3f_GrSLType, kDefault_GrSLPrecision,

"Conical2FSParams");

SkString tName("t");

@@ -1209,10 +1209,10 @@ void GLCircleOutside2PtConicalEffect::emitCode(EmitArgs& args) {

const CircleOutside2PtConicalEffect& ge = args.fFp.cast<CircleOutside2PtConicalEffect>();

GrGLSLUniformHandler* uniformHandler = args.fUniformHandler;

this->emitUniforms(uniformHandler, ge);

- fCenterUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility,

+ fCenterUni = uniformHandler->addUniform(kFragment_GrShaderFlag,

kVec2f_GrSLType, kDefault_GrSLPrecision,

"Conical2FSCenter");

- fParamUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility,

+ fParamUni = uniformHandler->addUniform(kFragment_GrShaderFlag,

kVec4f_GrSLType, kDefault_GrSLPrecision,

"Conical2FSParams");

SkString tName("t");

« no previous file with comments | « src/effects/gradients/SkGradientShader.cpp ('k') | src/gpu/GrDefaultGeoProcFactory.cpp » ('j') | no next file with comments »