Commit b791d9ce authored by kbr@google.com's avatar kbr@google.com

Revert 98355 (was semantically incorrect, caused assertion failures in Debug...

Revert 98355 (was semantically incorrect, caused assertion failures in Debug builds with some apps) - 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

TBR=kbr@google.com
Review URL: http://codereview.chromium.org/7795006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98694 0039d316-1c4b-4281-b951-d872f2087c98
parent a6dd01f1
...@@ -2529,11 +2529,8 @@ bool GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) { ...@@ -2529,11 +2529,8 @@ bool GLES2DecoderImpl::ResizeOffscreenFrameBuffer(const gfx::Size& size) {
// Workaround for NVIDIA driver bug on OS X; 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 // crbug.com/94163. TODO(kbr): figure out reproduction so Apple will
// fix this. // fix this.
if (needs_mac_nvidia_driver_workaround_) { if (needs_mac_nvidia_driver_workaround_)
offscreen_saved_frame_buffer_->Create(); offscreen_saved_frame_buffer_->Create();
offscreen_saved_color_texture_->Create();
glFlush();
}
// Allocate the offscreen saved color texture. // Allocate the offscreen saved color texture.
DCHECK(offscreen_saved_color_format_); DCHECK(offscreen_saved_color_format_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment