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

Unified Diff: gpu/command_buffer/service/context_group.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 | « no previous file | gpu/command_buffer/service/feature_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/context_group.cc
diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc
index 2a47fd48fec138e178ce19db40eadd7dcb1f777d..d873ace2031d18b61698cd33ea1148bb625fc693 100644
--- a/gpu/command_buffer/service/context_group.cc
+++ b/gpu/command_buffer/service/context_group.cc
@@ -163,17 +163,11 @@ bool ContextGroup::Initialize(const DisallowedFeatures& disallowed_features,
// TODO(gman): Update this code to check for a specific version of
// the drivers above which we no longer need this fix.
#if defined(OS_MACOSX)
- const char* vendor_str = reinterpret_cast<const char*>(
- glGetString(GL_VENDOR));
- if (vendor_str) {
- std::string lc_str(::StringToLowerASCII(std::string(vendor_str)));
- bool intel_on_mac = strstr(lc_str.c_str(), "intel");
- if (intel_on_mac) {
- max_texture_size = std::min(
+ if (feature_info_->feature_flags().is_intel) {
+ max_texture_size = std::min(
static_cast<GLint>(4096), max_texture_size);
- max_cube_map_texture_size = std::min(
+ max_cube_map_texture_size = std::min(
static_cast<GLint>(512), max_cube_map_texture_size);
- }
}
#endif
texture_manager_.reset(new TextureManager(feature_info_.get(),
« no previous file with comments | « no previous file | gpu/command_buffer/service/feature_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698