summaryrefslogtreecommitdiffstats
path: root/gpu
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 23:47:25 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 23:47:25 +0000
commit248f0e5e1635ad8061e76d39b08ec390a2e7513f (patch)
tree0d6011f7586b96fb612d66d4690567613702c4a5 /gpu
parent68e7bad6134ccf9261c7588a056beaa6dc78e10b (diff)
downloadchromium_src-248f0e5e1635ad8061e76d39b08ec390a2e7513f.zip
chromium_src-248f0e5e1635ad8061e76d39b08ec390a2e7513f.tar.gz
chromium_src-248f0e5e1635ad8061e76d39b08ec390a2e7513f.tar.bz2
Further attempted workarounds for Mac- and NVIDIA-specific crash. Can
not reproduce this crash in house any more, so adding more code along the lines of the earlier fix which was known to work on some hardware. BUG=94103 TEST=none (tested manually to verify no regression) Review URL: http://codereview.chromium.org/7756001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
-rw-r--r--gpu/command_buffer/service/gles2_cmd_decoder.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 2bc6029..6d42925 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -2529,8 +2529,11 @@ bool GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
// 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_)
+ if (needs_mac_nvidia_driver_workaround_) {
offscreen_saved_frame_buffer_->Create();
+ offscreen_saved_color_texture_->Create();
+ glFlush();
+ }
// Allocate the offscreen saved color texture.
DCHECK(offscreen_saved_color_format_);