diff options
| author |  egdaniel <egdaniel@google.com> | 2015-10-26 08:59:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-26 08:59:10 -0700 |
| commit | 0a4823378308d42f871833b1b1b38164c56f8678 (patch) | |
| tree | 15dd12aceb678bd4d53314b8a179f075eccb0bbd | |
| parent | e092cee9ad96c8df1af05dcb0c078874b67c1a8e (diff) | |
Fix GLCaps order for CoreProfile
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/1417503005
| -rw-r--r-- | src/gpu/gl/GrGLCaps.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 91bcd72ea7..ddb6c80230 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. |