From 74a3a2135ca82ab9324b7e499caa3280348a4fda Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Fri, 30 Aug 2013 19:43:59 +0000 Subject: Rename ShaderType enum to ShaderVisibility Renames ShaderType in GrGLShaderBuilder to ShaderVisibility. It is now used solely as a bitfield. Methods that previously accepted a single ShaderType value are split into separate calls: - getShader -> vsGetShader, gsGetShader, fsGetShader - emiitFunction -> fsEmitFunction - appendTextureLookup -> fsAppendTextureLookup No change in functionality. This is a refactoring to allow us to separate the vertex/geometry and fragment parts of GrGLShaderBuilder. R=bsalomon@google.com Author: cdalton@nvidia.com Review URL: https://chromiumcodereview.appspot.com/23826002 git-svn-id: http://skia.googlecode.com/svn/trunk@11044 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/gradients/SkTwoPointConicalGradient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/effects/gradients/SkTwoPointConicalGradient.cpp') diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 6926c2d2ec..5e0c4b892b 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -499,9 +499,9 @@ void GrGLConical2Gradient::emitCode(GrGLShaderBuilder* builder, // 2 copies of uniform array, 1 for each of vertex & fragment shader, // to work around Xoom bug. Doesn't seem to cause performance decrease // in test apps, but need to keep an eye on it. - fVSParamUni = builder->addUniformArray(GrGLShaderBuilder::kVertex_ShaderType, + fVSParamUni = builder->addUniformArray(GrGLShaderBuilder::kVertex_Visibility, kFloat_GrSLType, "Conical2VSParams", 6); - fFSParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_ShaderType, + fFSParamUni = builder->addUniformArray(GrGLShaderBuilder::kFragment_Visibility, kFloat_GrSLType, "Conical2FSParams", 6); // For radial gradients without perspective we can pass the linear -- cgit v1.2.3