Index: src/gpu/gl/GrGLProgram.cpp |
diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp |
index 8c2dd966b00dcd3c5aeefd9ddcf1eca1221060df..19957571a023f6b472bbc3715c8056623bf3922f 100644 |
--- a/src/gpu/gl/GrGLProgram.cpp |
+++ b/src/gpu/gl/GrGLProgram.cpp |
@@ -28,9 +28,10 @@ GrGLProgram* GrGLProgram::Create(GrGpuGL* gpu, |
const GrEffectStage* colorStages[], |
const GrEffectStage* coverageStages[]) { |
SkAutoTDelete<GrGLProgramBuilder> builder; |
- if (!desc.getHeader().fRequiresVertexShader && |
- gpu->glCaps().pathRenderingSupport() && |
- gpu->glPathRendering()->texturingMode() == GrGLPathRendering::FixedFunction_TexturingMode) { |
+ if (desc.getHeader().fDoPathRendering) { |
bsalomon
2014/09/19 17:29:49
I think this should have a different name since we
egdaniel
2014/09/19 17:44:05
changed to fUseFragShaderOnly
On 2014/09/19 17:29
|
+ SkASSERT(gpu->glPathRendering()->texturingMode() == |
+ GrGLPathRendering::FixedFunction_TexturingMode); |
+ SkASSERT(gpu->glCaps().pathRenderingSupport()); |
SkASSERT(NULL == geometryProcessor); |
builder.reset(SkNEW_ARGS(GrGLFragmentOnlyProgramBuilder, (gpu, desc))); |
} else { |