diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkColorMatrixFilterRowMajor255.cpp | 4 | ||||
| -rw-r--r-- | src/core/SkLightingShader.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/SkColorMatrixFilterRowMajor255.cpp b/src/core/SkColorMatrixFilterRowMajor255.cpp index 33bf042233..3b79d7f42c 100644 --- a/src/core/SkColorMatrixFilterRowMajor255.cpp +++ b/src/core/SkColorMatrixFilterRowMajor255.cpp @@ -257,10 +257,10 @@ public: void emitCode(EmitArgs& args) override { GrGLSLUniformHandler* uniformHandler = args.fUniformHandler; - fMatrixHandle = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fMatrixHandle = uniformHandler->addUniform(kFragment_GrShaderFlag, kMat44f_GrSLType, kDefault_GrSLPrecision, "ColorMatrix"); - fVectorHandle = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fVectorHandle = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec4f_GrSLType, kDefault_GrSLPrecision, "ColorMatrixVector"); diff --git a/src/core/SkLightingShader.cpp b/src/core/SkLightingShader.cpp index a9fcac3b83..a68553e661 100644 --- a/src/core/SkLightingShader.cpp +++ b/src/core/SkLightingShader.cpp @@ -185,22 +185,22 @@ public: // add uniforms const char* lightDirUniName = nullptr; - fLightDirUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fLightDirUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec3f_GrSLType, kDefault_GrSLPrecision, "LightDir", &lightDirUniName); const char* lightColorUniName = nullptr; - fLightColorUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fLightColorUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec3f_GrSLType, kDefault_GrSLPrecision, "LightColor", &lightColorUniName); const char* ambientColorUniName = nullptr; - fAmbientColorUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fAmbientColorUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec3f_GrSLType, kDefault_GrSLPrecision, "AmbientColor", &ambientColorUniName); const char* xformUniName = nullptr; - fXformUni = uniformHandler->addUniform(GrGLSLUniformHandler::kFragment_Visibility, + fXformUni = uniformHandler->addUniform(kFragment_GrShaderFlag, kVec2f_GrSLType, kDefault_GrSLPrecision, "Xform", &xformUniName); |