AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix GLCaps order for CoreProfile

Browse Source 
TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/1417503005
This commit is contained in:
egdaniel 2015-10-26 08:59:10 -07:00 committed by Commit bot
parent e092cee9ad
commit 0a48233783
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gpu/gl/GrGLCaps.cpp
View File

@ -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.