Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(153)

Unified Diff: gpu/command_buffer/service/feature_info.cc

Issue 11574023: Ignore GL_ANGLE_framebuffer_multisample on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/feature_info.cc
diff --git a/gpu/command_buffer/service/feature_info.cc b/gpu/command_buffer/service/feature_info.cc
index 0a20733671ee2b68a57e98cf012c4f10a1bcb624..d447022161beeb1a2abf7f6b0d54d472f5666662 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -512,10 +512,15 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
}
// Check for multisample support
+ bool ext_has_multisample = ext.Have("GL_EXT_framebuffer_multisample");
+ if (!is_qualcomm || feature_flags_.disable_workarounds) {
+ // Some Android Qualcomm drivers falsely report this ANGLE extension string.
+ // See http://crbug.com/165736
+ ext_has_multisample |= ext.Have("GL_ANGLE_framebuffer_multisample");
+ }
if (!disallowed_features_.multisampling &&
ext.Desire("GL_CHROMIUM_framebuffer_multisample") &&
- (ext.Have("GL_EXT_framebuffer_multisample") ||
- ext.Have("GL_ANGLE_framebuffer_multisample"))) {
+ ext_has_multisample) {
feature_flags_.chromium_framebuffer_multisample = true;
validators_.frame_buffer_target.AddValue(GL_READ_FRAMEBUFFER_EXT);
validators_.frame_buffer_target.AddValue(GL_DRAW_FRAMEBUFFER_EXT);
« no previous file with comments | « no previous file | gpu/command_buffer/service/gles2_cmd_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698