| Index: src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| index e65ea880c3ec41d1eb216308955f96ffe9c19000..37ba3dc942f6e525c9673a319c61da9d4b073eb8 100644
|
| --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| @@ -75,7 +75,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const DrawArgs& args, GrGLGpu* gp
|
| GrGLProgramBuilder* GrGLProgramBuilder::CreateProgramBuilder(const DrawArgs& args,
|
| GrGLGpu* gpu) {
|
| if (args.fPrimitiveProcessor->isPathRendering()) {
|
| - SkASSERT(gpu->glCaps().pathRenderingSupport() &&
|
| + SkASSERT(gpu->glCaps().shaderCaps()->pathRenderingSupport() &&
|
| !args.fPrimitiveProcessor->willUseGeoShader() &&
|
| args.fPrimitiveProcessor->numAttribs() == 0);
|
| return SkNEW_ARGS(GrGLNvprProgramBuilder, (gpu, args));
|
| @@ -302,7 +302,7 @@ void GrGLProgramBuilder::emitAndInstallProc(const GrPrimitiveProcessor& gp,
|
| fGeometryProcessor = SkNEW(GrGLInstalledGeoProc);
|
|
|
| const GrBatchTracker& bt = this->batchTracker();
|
| - fGeometryProcessor->fGLProc.reset(gp.createGLInstance(bt, fGpu->glCaps()));
|
| + fGeometryProcessor->fGLProc.reset(gp.createGLInstance(bt, *fGpu->glCaps().glslCaps()));
|
|
|
| SkSTArray<4, GrGLProcessor::TextureSampler> samplers(gp.numTextures());
|
| this->emitSamplers(gp, &samplers, fGeometryProcessor);
|
|
|