From 0a4823378308d42f871833b1b1b38164c56f8678 Mon Sep 17 00:00:00 2001 From: egdaniel Date: Mon, 26 Oct 2015 08:59:10 -0700 Subject: [PATCH] Fix GLCaps order for CoreProfile TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/1417503005 --- src/gpu/gl/GrGLCaps.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp index 91bcd72..ddb6c80 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(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(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. -- 2.7.4