diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 00:47:27 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 00:47:27 +0000 |
| commit | 5ef9e1be02d7e366b31857ac9f18d35fa6aa7187 (patch) | |
| tree | 04a1316d2f0bdb1febdf082a57d1b9b0b3c2f55d | |
| parent | 105c4e4b83a4d222af6c5c6f3a9d29ab250285dc (diff) | |
| download | chromium_src-5ef9e1be02d7e366b31857ac9f18d35fa6aa7187.zip chromium_src-5ef9e1be02d7e366b31857ac9f18d35fa6aa7187.tar.gz chromium_src-5ef9e1be02d7e366b31857ac9f18d35fa6aa7187.tar.bz2 | |
Merge 98146 - Use workaround for Mac NVIDIA driver bug on Lion as well.
BUG=94103
TEST=none
Review URL: http://codereview.chromium.org/7740010
TBR=kbr@google.com
Review URL: http://codereview.chromium.org/7744012
git-svn-id: svn://svn.chromium.org/chrome/branches/835/src@98157 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index de97afe..c8aab09 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -15,9 +15,6 @@ #include "base/atomicops.h" #include "base/at_exit.h" #include "base/callback.h" -#if defined(OS_MACOSX) -#include "base/mac/mac_util.h" -#endif #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" @@ -1926,8 +1923,7 @@ bool GLES2DecoderImpl::Initialize( const char* vendor_str = reinterpret_cast<const char*>( glGetString(GL_VENDOR)); needs_mac_nvidia_driver_workaround_ = - vendor_str && strstr(vendor_str, "NVIDIA") && - base::mac::IsOSSnowLeopardOrEarlier(); + vendor_str && strstr(vendor_str, "NVIDIA"); #endif if (!InitializeShaderTranslator()) { @@ -2311,7 +2307,9 @@ bool GLES2DecoderImpl::UpdateOffscreenFrameBufferSize() { RestoreClearState(); } - // Workaround for driver bug on OS X 10.6.x and earlier; crbug.com/89557 + // Workaround for NVIDIA driver bug on OS X; crbug.com/89557, + // crbug.com/94163. TODO(kbr): figure out reproduction so Apple will + // fix this. if (needs_mac_nvidia_driver_workaround_) offscreen_saved_frame_buffer_->Create(); |