commit 05ded891272772d43acc16345b2f90a4560df090
author egdaniel <egdaniel@google.com> Mon Oct 26 07:38:05 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Oct 26 07:38:05 2015 -0700
tree fb3920bfb79856e20702664af6a6196e016c5c4d
parent e72bd028d9046f42adb97eaf878e3a54f208ada8

Fix gl caps for mixed sample support

The dependencies between glsl caps and some gl ones were more complex than I had thought with original change especially in regards to mix samples, advanced blends, and similar features.

This changes simply reverts back to the original order of setting the caps so it should fix all perf issues that were seen in the X1

BUG=skia:4505

Review URL: https://codereview.chromium.org/1420423002

src/gpu/gl/GrGLCaps.h

diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h
index 8c901de..2ad5827 100644
--- a/src/gpu/gl/GrGLCaps.h
+++ b/src/gpu/gl/GrGLCaps.h
@@ -270,7 +270,7 @@
 
 private:
     void init(const GrContextOptions&, const GrGLContextInfo&, const GrGLInterface*);
-    void initGLSL(const GrContextOptions&, const GrGLContextInfo&, const GrGLInterface*);
+    void initGLSL(const GrGLContextInfo&);
     bool hasPathRenderingSupport(const GrGLContextInfo&, const GrGLInterface*);
 
     /**