| Index: src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| index e81c079d4a3b2b33398e979f79ad1a83fa020bfe..c26a72ec50f342090fcce8cbfe80582ab92fbfa5 100644
|
| --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp
|
| @@ -74,7 +74,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const DrawArgs& args, GrGLGpu* gp
|
|
|
| GrGLProgramBuilder* GrGLProgramBuilder::CreateProgramBuilder(const DrawArgs& args,
|
| GrGLGpu* gpu) {
|
| - if (GrGpu::IsPathRenderingDrawType(args.fOptState->drawType())) {
|
| + if (GrGpu::IsPathRenderingDrawType(args.fDrawType)) {
|
| SkASSERT(gpu->glCaps().pathRenderingSupport() &&
|
| !args.fPrimitiveProcessor->willUseGeoShader() &&
|
| args.fPrimitiveProcessor->numAttribs() == 0);
|
| @@ -396,7 +396,7 @@ GrGLProgram* GrGLProgramBuilder::finalize() {
|
|
|
| // Legacy nvpr will not compile with a vertex shader, but newer nvpr requires a dummy vertex
|
| // shader
|
| - bool useNvpr = GrGpu::IsPathRenderingDrawType(this->optState().drawType());
|
| + bool useNvpr = GrGpu::IsPathRenderingDrawType(this->drawType());
|
| if (!(useNvpr && fGpu->glCaps().nvprSupport() == GrGLCaps::kLegacy_NvprSupport)) {
|
| if (!fVS.compileAndAttachShaders(programID, &shadersToDelete)) {
|
| this->cleanupProgram(programID, shadersToDelete);
|
|
|