Index: src/gpu/gl/GrGLCaps.cpp |
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp |
index 91bcd72ea7ed84c54ff823b0a8aac73854027149..ddb6c80230d73e0e26476b73cd6650df6d5fd34f 100644 |
--- a/src/gpu/gl/GrGLCaps.cpp |
+++ b/src/gpu/gl/GrGLCaps.cpp |
@@ -64,9 +64,6 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, |
GrGLStandard standard = ctxInfo.standard(); |
GrGLVersion version = ctxInfo.version(); |
- this->initGLSL(ctxInfo); |
- GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get()); |
- |
/************************************************************************** |
* Caps specific to GrGLCaps |
**************************************************************************/ |
@@ -289,6 +286,10 @@ void GrGLCaps::init(const GrContextOptions& contextOptions, |
* GrShaderCaps fields |
**************************************************************************/ |
+ // This must be called after fCoreProfile is set on the GrGLCaps |
+ this->initGLSL(ctxInfo); |
+ GrGLSLCaps* glslCaps = static_cast<GrGLSLCaps*>(fShaderCaps.get()); |
+ |
glslCaps->fPathRenderingSupport = this->hasPathRenderingSupport(ctxInfo, gli); |
// For now these two are equivalent but we could have dst read in shader via some other method. |