| Index: src/gpu/gl/GrGLCaps.cpp
|
| diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
|
| index 6f272b7b8e2d19d7ed610100dcf40d97f3d26dff..13ce5070a6047a9ada81f5a7cfdf7d59bcdeacb2 100644
|
| --- a/src/gpu/gl/GrGLCaps.cpp
|
| +++ b/src/gpu/gl/GrGLCaps.cpp
|
| @@ -49,7 +49,10 @@ GrGLCaps::GrGLCaps(const GrContextOptions& contextOptions,
|
|
|
| this->init(ctxInfo, glInterface);
|
|
|
| - fShaderCaps.reset(SkNEW_ARGS(GrGLSLCaps, (ctxInfo, glInterface, *this)));
|
| + fShaderCaps.reset(SkNEW_ARGS(GrGLSLCaps, (contextOptions,
|
| + ctxInfo, glInterface, *this)));
|
| +
|
| + this->applyOptionsOverrides(contextOptions);
|
| }
|
|
|
| void GrGLCaps::init(const GrGLContextInfo& ctxInfo, const GrGLInterface* gli) {
|
| @@ -893,7 +896,8 @@ SkString GrGLCaps::dump() const {
|
|
|
| ////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
| -GrGLSLCaps::GrGLSLCaps(const GrGLContextInfo& ctxInfo,
|
| +GrGLSLCaps::GrGLSLCaps(const GrContextOptions& options,
|
| + const GrGLContextInfo& ctxInfo,
|
| const GrGLInterface* gli,
|
| const GrGLCaps& glCaps) {
|
| fDropsTileOnZeroDivide = false;
|
| @@ -903,6 +907,7 @@ GrGLSLCaps::GrGLSLCaps(const GrGLContextInfo& ctxInfo,
|
| fFBFetchColorName = NULL;
|
| fFBFetchExtensionString = NULL;
|
| this->init(ctxInfo, gli, glCaps);
|
| + this->applyOptionsOverrides(options);
|
| }
|
|
|
| void GrGLSLCaps::init(const GrGLContextInfo& ctxInfo,
|
|
|