Chromium Code Reviews| Index: ui/gl/gl_version_info.h |
| diff --git a/ui/gl/gl_version_info.h b/ui/gl/gl_version_info.h |
| index c4c39a65011d3620eb346595db80fda8818c0a9d..9f3b81a8b6c1f89d3eeec2f639cd3fa0ce26b5a5 100644 |
| --- a/ui/gl/gl_version_info.h |
| +++ b/ui/gl/gl_version_info.h |
| @@ -39,17 +39,7 @@ struct GL_EXPORT GLVersionInfo { |
| return is_es || is_desktop_core_profile; |
| } |
| - bool IsES3Capable() const { |
| - if (IsAtLeastGLES(3, 0) || IsAtLeastGL(4, 2)) |
| - return true; |
| -#if defined(OS_MACOSX) |
| - // TODO(zmo): For experimentation purpose on MacOSX with core profile, |
| - // allow 3.2 or plus for now. |
| - if (IsAtLeastGL(3, 2)) |
| - return true; |
| -#endif |
| - return false; |
| - } |
| + bool IsES3Capable(std::set<std::string>& extensions) const; |
|
Zhenyao Mo
2016/06/24 21:35:50
Delete this.
Corentin Wallez
2016/06/27 15:35:42
Done
|
| static void ParseVersionString(const char* version_str, |
| unsigned* major_version, |
| @@ -65,9 +55,14 @@ struct GL_EXPORT GLVersionInfo { |
| bool is_es2; |
| bool is_es3; |
| bool is_desktop_core_profile; |
| + bool is_es3_capable; |
| private: |
| - GLVersionInfo(const char* version_str, const char* renderer_str); |
| + GLVersionInfo(); |
| + void Initialize(const char* version_str, |
| + const char* renderer_str, |
| + const std::set<std::string>& extensions); |
| + bool IsES3Capable(const std::set<std::string>& extensions) const; |
| DISALLOW_COPY_AND_ASSIGN(GLVersionInfo); |
| }; |