diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 13:49:32 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 13:49:32 +0000 |
| commit | 6896c7d25451b432eef42e580c4b4deecf2d3192 (patch) | |
| tree | 97f6af948ef0d334b34b59a46e8649e432f27a8a /gpu | |
| parent | b3ffafba32fac2cafffdd62a7e42d1949d5aa804 (diff) | |
| download | chromium_src-6896c7d25451b432eef42e580c4b4deecf2d3192.zip chromium_src-6896c7d25451b432eef42e580c4b4deecf2d3192.tar.gz chromium_src-6896c7d25451b432eef42e580c4b4deecf2d3192.tar.bz2 | |
Reduce the maximum texture size on Mac/AMD to 4096.
BUG=133936
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/10629014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/context_group.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/context_group.cc b/gpu/command_buffer/service/context_group.cc index cc86ce5..6a662ba 100644 --- a/gpu/command_buffer/service/context_group.cc +++ b/gpu/command_buffer/service/context_group.cc @@ -128,7 +128,8 @@ bool ContextGroup::Initialize(const DisallowedFeatures& disallowed_features, return false; } - // Limit Intel on Mac to 512. + // Limit Intel on Mac to 4096 max tex size and 512 max cube map tex size. + // Limit AMD on Mac to 4096 max tex size and max cube map tex size. // 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) @@ -138,6 +139,12 @@ bool ContextGroup::Initialize(const DisallowedFeatures& disallowed_features, max_cube_map_texture_size = std::min( static_cast<GLint>(512), max_cube_map_texture_size); } + if (feature_info_->feature_flags().is_amd) { + max_texture_size = std::min( + static_cast<GLint>(4096), max_texture_size); + max_cube_map_texture_size = std::min( + static_cast<GLint>(4096), max_cube_map_texture_size); + } #endif texture_manager_.reset(new TextureManager(feature_info_.get(), max_texture_size, |