gpu/gles2_conform_support/egl/display.cc - Issue 226423002: Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 226423002: Merge 261120 "gpu: Lose context when BeginQueryEXT fails to allo..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/

Patch Set: 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

Index: gpu/gles2_conform_support/egl/display.cc

===================================================================

--- gpu/gles2_conform_support/egl/display.cc (revision 261815)

+++ gpu/gles2_conform_support/egl/display.cc (working copy)

@@ -229,13 +229,15 @@

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,

- gpu_control_.get()));

+ 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 »