| Index: src/gpu/effects/GrYUVEffect.cpp
|
| diff --git a/src/gpu/effects/GrYUVEffect.cpp b/src/gpu/effects/GrYUVEffect.cpp
|
| index a227e05fdea4858a9c982cae885470b138544a9a..9fd643bdb94500105edd5f0366f2533a84c74c9e 100644
|
| --- a/src/gpu/effects/GrYUVEffect.cpp
|
| +++ b/src/gpu/effects/GrYUVEffect.cpp
|
| @@ -102,10 +102,9 @@ public:
|
| GrGLSLFragmentBuilder* fragBuilder = args.fFragBuilder;
|
|
|
| const char* colorSpaceMatrix = nullptr;
|
| - fMatrixUni = args.fUniformHandler->addUniform(
|
| - GrGLSLUniformHandler::kFragment_Visibility,
|
| - kMat44f_GrSLType, kDefault_GrSLPrecision,
|
| - "ColorSpaceMatrix", &colorSpaceMatrix);
|
| + fMatrixUni = args.fUniformHandler->addUniform(kFragment_GrShaderFlag,
|
| + kMat44f_GrSLType, kDefault_GrSLPrecision,
|
| + "ColorSpaceMatrix", &colorSpaceMatrix);
|
| fragBuilder->codeAppendf("%s = vec4(", args.fOutputColor);
|
| fragBuilder->appendTextureLookup(args.fSamplers[0], args.fCoords[0].c_str(),
|
| args.fCoords[0].getType());
|
| @@ -236,7 +235,7 @@ public:
|
| switch (oc) {
|
| case kYUV_OutputChannels:
|
| fRGBToYUVUni = args.fUniformHandler->addUniformArray(
|
| - GrGLSLUniformHandler::kFragment_Visibility,
|
| + kFragment_GrShaderFlag,
|
| kVec4f_GrSLType, kDefault_GrSLPrecision,
|
| "RGBToYUV", 3, &uniName);
|
| fragBuilder->codeAppendf("%s = vec4(dot(rgbColor.rgb, %s[0].rgb) + %s[0].a,"
|
| @@ -248,7 +247,7 @@ public:
|
| break;
|
| case kUV_OutputChannels:
|
| fRGBToYUVUni = args.fUniformHandler->addUniformArray(
|
| - GrGLSLUniformHandler::kFragment_Visibility,
|
| + kFragment_GrShaderFlag,
|
| kVec4f_GrSLType, kDefault_GrSLPrecision,
|
| "RGBToUV", 2, &uniName);
|
| fragBuilder->codeAppendf("%s = vec4(dot(rgbColor.rgb, %s[0].rgb) + %s[0].a,"
|
| @@ -261,7 +260,7 @@ public:
|
| case kU_OutputChannels:
|
| case kV_OutputChannels:
|
| fRGBToYUVUni = args.fUniformHandler->addUniform(
|
| - GrGLSLUniformHandler::kFragment_Visibility,
|
| + kFragment_GrShaderFlag,
|
| kVec4f_GrSLType, kDefault_GrSLPrecision,
|
| "RGBToYUorV", &uniName);
|
| fragBuilder->codeAppendf("%s = vec4(dot(rgbColor.rgb, %s.rgb) + %s.a);\n",
|
|
|