diff options
| author | bajones <bajones@chromium.org> | 2015-11-02 21:04:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-03 05:05:21 +0000 |
| commit | e786bba864c3abf0a2a810ea469ccb1d423975a7 (patch) | |
| tree | e8e7af641e2762fcc93b0efe7467da0400634a9d /gpu | |
| parent | c96116b9c01f80d7c793cc0f6bc032c5379b93e8 (diff) | |
| download | chromium_src-e786bba864c3abf0a2a810ea469ccb1d423975a7.zip chromium_src-e786bba864c3abf0a2a810ea469ccb1d423975a7.tar.gz chromium_src-e786bba864c3abf0a2a810ea469ccb1d423975a7.tar.bz2 | |
Ensured instancing was exposed for WebGL 2 on OSX
BUG=295792
Review URL: https://codereview.chromium.org/1409733007
Cr-Commit-Position: refs/heads/master@{#357532}
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/feature_info.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc index 9e6d4ada..4e5aefe 100644 --- a/gpu/command_buffer/service/feature_info.cc +++ b/gpu/command_buffer/service/feature_info.cc @@ -934,7 +934,8 @@ void FeatureInfo::InitializeFeatures() { (extensions.Contains("GL_ANGLE_instanced_arrays") || (extensions.Contains("GL_ARB_instanced_arrays") && extensions.Contains("GL_ARB_draw_instanced")) || - gl_version_info_->is_es3)) { + gl_version_info_->is_es3 || + gl_version_info_->is_desktop_core_profile)) { AddExtensionString("GL_ANGLE_instanced_arrays"); feature_flags_.angle_instanced_arrays = true; validators_.vertex_attribute.AddValue(GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE); |