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

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

Issue 10381137: Don't enable occlusion query on Linux with Intel drivers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 months 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 | « gpu/command_buffer/service/feature_info.h ('k') | gpu/command_buffer/service/feature_info_unittest.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 011fecc3fc4bd4e3b84e7c320b3e7e1ff27f70be..899c38119e89aaef610e25577460983451df3701 100644
--- a/gpu/command_buffer/service/feature_info.cc
+++ b/gpu/command_buffer/service/feature_info.cc
@@ -7,6 +7,7 @@
#include <set>
#include "base/string_number_conversions.h"
+#include "base/string_util.h"
#include "gpu/command_buffer/service/gl_utils.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_implementation.h"
@@ -108,6 +109,16 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
gfx::GLContext::GetCurrent()->GetExtensions().c_str() :
reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS)),
desired_features);
+ const char* vendor_str = reinterpret_cast<const char*>(
+ glGetString(GL_VENDOR));
+ if (vendor_str) {
+ std::string str(StringToLowerASCII(std::string(vendor_str)));
+ feature_flags_.is_intel = str.find("intel") != std::string::npos;
+ feature_flags_.is_nvidia = str.find("nvidia") != std::string::npos;
+ feature_flags_.is_amd =
+ str.find("amd") != std::string::npos ||
+ str.find("ati") != std::string::npos;
+ }
bool npot_ok = false;
@@ -446,7 +457,15 @@ void FeatureInfo::AddFeatures(const char* desired_features) {
ext.Have("GL_EXT_occlusion_query_boolean");
bool have_arb_occlusion_query2 = ext.Have("GL_ARB_occlusion_query2");
bool have_arb_occlusion_query = ext.Have("GL_ARB_occlusion_query");
- if (ext.Desire("GL_EXT_occlusion_query_boolean") &&
+ bool ext_occlusion_query_disallowed = false;
+
+#if defined(OS_LINUX)
+ // Intel drivers on Linux appear to be buggy.
+ ext_occlusion_query_disallowed = feature_flags_.is_intel;
+#endif
+
+ if (!ext_occlusion_query_disallowed &&
+ ext.Desire("GL_EXT_occlusion_query_boolean") &&
(have_ext_occlusion_query_boolean ||
have_arb_occlusion_query2 ||
have_arb_occlusion_query)) {
« no previous file with comments | « gpu/command_buffer/service/feature_info.h ('k') | gpu/command_buffer/service/feature_info_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698