From 16578a8e3481ffdde5b699fe747f114efb64a26b Mon Sep 17 00:00:00 2001 From: "pfeldman@chromium.org" Date: Wed, 2 Apr 2014 04:56:18 +0000 Subject: Revert of gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate. (https://codereview.chromium.org/199443004/) Reason for revert: Build failure in content/common/gpu/client/gl_helper_benchmark.cc. http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/63241/steps/compile/logs/stdio Original issue's description: > gpu: Lose context when BeginQueryEXT fails to allocate. > > Instead of crashes, raise a GL_OUT_OF_MEMORY error. Since compositor > does not want to deal with these errors and it would leave it in a > bad state, add the ability to lose the context when GL_OUT_OF_MEMORY > occurs. > > R=piman > BUG=351587 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261064 TBR=piman@chromium.org,dmichael@chromium.org,jamesr@chromium.org,danakj@chromium.org NOTREECHECKS=true NOTRY=true BUG=351587 Review URL: https://codereview.chromium.org/221783002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261075 0039d316-1c4b-4281-b951-d872f2087c98 --- gpu/gles2_conform_support/egl/display.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'gpu/gles2_conform_support') diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc index 8b43dff..9885cd6 100644 --- a/gpu/gles2_conform_support/egl/display.cc +++ b/gpu/gles2_conform_support/egl/display.cc @@ -229,15 +229,13 @@ EGLContext Display::CreateContext(EGLConfig config, DCHECK(transfer_buffer_.get()); bool bind_generates_resources = true; - bool lose_context_when_out_of_memory = false; - - context_.reset( - new gpu::gles2::GLES2Implementation(gles2_cmd_helper_.get(), - NULL, - transfer_buffer_.get(), - bind_generates_resources, - lose_context_when_out_of_memory, - gpu_control_.get())); + + context_.reset(new gpu::gles2::GLES2Implementation( + gles2_cmd_helper_.get(), + NULL, + transfer_buffer_.get(), + bind_generates_resources, + gpu_control_.get())); if (!context_->Initialize( kTransferBufferSize, -- cgit v1.1