diff options
Diffstat (limited to 'chromium/gpu/command_buffer/service/feature_info.cc')
-rw-r--r-- | chromium/gpu/command_buffer/service/feature_info.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chromium/gpu/command_buffer/service/feature_info.cc b/chromium/gpu/command_buffer/service/feature_info.cc index b0fb12073b2..41c6a1b03a3 100644 --- a/chromium/gpu/command_buffer/service/feature_info.cc +++ b/chromium/gpu/command_buffer/service/feature_info.cc @@ -605,9 +605,10 @@ void FeatureInfo::AddFeatures(const CommandLine& command_line) { !have_arb_occlusion_query2; } - if (extensions.Contains("GL_ANGLE_instanced_arrays") || - (extensions.Contains("GL_ARB_instanced_arrays") && - extensions.Contains("GL_ARB_draw_instanced"))) { + if (!workarounds_.disable_angle_instanced_arrays && + (extensions.Contains("GL_ANGLE_instanced_arrays") || + (extensions.Contains("GL_ARB_instanced_arrays") && + extensions.Contains("GL_ARB_draw_instanced")))) { AddExtensionString("GL_ANGLE_instanced_arrays"); feature_flags_.angle_instanced_arrays = true; validators_.vertex_attribute.AddValue(GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE); |