| Index: src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
|
| diff --git a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
|
| index fc92da713af214e481f359d5ae28d8f8b0fd3cf5..de0bb03aa38e7b6fb148f2bd91ec00fa0ce35cce 100644
|
| --- a/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
|
| +++ b/src/gpu/gl/builders/GrGLVertexShaderBuilder.cpp
|
| @@ -21,7 +21,7 @@ GrGLVertexBuilder::GrGLVertexBuilder(GrGLProgramBuilder* program)
|
| void GrGLVertexBuilder::addVarying(const char* name, GrSLPrecision precision, GrGLVarying* v) {
|
| fOutputs.push_back();
|
| fOutputs.back().setType(v->fType);
|
| - fOutputs.back().setTypeModifier(GrGLShaderVar::kVaryingOut_TypeModifier);
|
| + fOutputs.back().setTypeModifier(GrGLSLShaderVar::kVaryingOut_TypeModifier);
|
| fOutputs.back().setPrecision(precision);
|
| fProgramBuilder->nameVariable(fOutputs.back().accessName(), 'v', name);
|
| v->fVsOut = fOutputs.back().getName().c_str();
|
| @@ -100,7 +100,7 @@ GrGLVertexBuilder::compileAndAttachShaders(GrGLuint programId, SkTDArray<GrGLuin
|
| bool GrGLVertexBuilder::addAttribute(const GrShaderVar& var) {
|
| SkASSERT(GrShaderVar::kAttribute_TypeModifier == var.getTypeModifier());
|
| for (int i = 0; i < fInputs.count(); ++i) {
|
| - const GrGLShaderVar& attr = fInputs[i];
|
| + const GrGLSLShaderVar& attr = fInputs[i];
|
| // if attribute already added, don't add it again
|
| if (attr.getName().equals(var.getName())) {
|
| return false;
|
|
|