diff options
| author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 04:56:18 +0000 |
|---|---|---|
| committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-02 04:56:18 +0000 |
| commit | 16578a8e3481ffdde5b699fe747f114efb64a26b (patch) | |
| tree | aded2899b6e2b8c44ed8efdad826a9c2659c173f /gpu/gles2_conform_support | |
| parent | 1cd6af20ba32d3fc4ebf4290cf25f8fac9bc9c05 (diff) | |
| download | chromium_src-16578a8e3481ffdde5b699fe747f114efb64a26b.zip chromium_src-16578a8e3481ffdde5b699fe747f114efb64a26b.tar.gz chromium_src-16578a8e3481ffdde5b699fe747f114efb64a26b.tar.bz2 | |
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
Diffstat (limited to 'gpu/gles2_conform_support')
| -rw-r--r-- | gpu/gles2_conform_support/egl/display.cc | 16 |
1 files changed, 7 insertions, 9 deletions
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, |