Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: gpu/gles2_conform_support/egl/display.cc

Issue 199443004: gpu: Raise GL_OUT_OF_MEMORY when BeginQueryEXT fails to allocate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: checkmem: benchmark Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | mojo/examples/aura_demo/demo_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/gles2_conform_support/egl/display.cc
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index 9885cd69286e8525f672b2d87e05450ceb17db21..8b43dffe8b2d4f3341b151557cf6f6424b3fdec9 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -229,13 +229,15 @@ EGLContext Display::CreateContext(EGLConfig config,
DCHECK(transfer_buffer_.get());
bool bind_generates_resources = true;
-
- context_.reset(new gpu::gles2::GLES2Implementation(
- gles2_cmd_helper_.get(),
- NULL,
- transfer_buffer_.get(),
- bind_generates_resources,
- gpu_control_.get()));
+ 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()));
if (!context_->Initialize(
kTransferBufferSize,
« no previous file with comments | « gpu/command_buffer/tests/gl_manager.cc ('k') | mojo/examples/aura_demo/demo_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698