| Index: src/gpu/gl/GrGLProgram.cpp
|
| diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
|
| index 1fe1d1772ab549f17b40c7d529091eb73eb53d6a..3cf9e4dd7c66b28afdf412ab13b7046b67750f1b 100644
|
| --- a/src/gpu/gl/GrGLProgram.cpp
|
| +++ b/src/gpu/gl/GrGLProgram.cpp
|
| @@ -30,7 +30,7 @@ GrGLProgram::GrGLProgram(GrGLGpu* gpu,
|
| const BuiltinUniformHandles& builtinUniforms,
|
| GrGLuint programID,
|
| const UniformInfoArray& uniforms,
|
| - const SeparableVaryingInfoArray& separableVaryings,
|
| + const VaryingInfoArray& pathProcVaryings,
|
| GrGLInstalledGeoProc* geometryProcessor,
|
| GrGLInstalledXferProc* xferProcessor,
|
| GrGLInstalledFragProcs* fragmentProcessors,
|
| @@ -42,7 +42,7 @@ GrGLProgram::GrGLProgram(GrGLGpu* gpu,
|
| , fFragmentProcessors(SkRef(fragmentProcessors))
|
| , fDesc(desc)
|
| , fGpu(gpu)
|
| - , fProgramDataManager(gpu, programID, uniforms, separableVaryings) {
|
| + , fProgramDataManager(gpu, programID, uniforms, pathProcVaryings) {
|
| fSamplerUniforms.swap(passSamplerUniforms);
|
| // Assign texture units to sampler uniforms one time up front.
|
| GL_CALL(UseProgram(fProgramID));
|
|
|