gpu/gles2_conform_support/egl/display.cc - Issue 7765013: Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt)

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 7765013: Revert 98504 - Manually merging trunk revs 95836 and 96904 to 835 branch (second attempt) (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 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 98533)

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

@@ -7,7 +7,6 @@

#include <vector>

#include "gpu/command_buffer/client/gles2_lib.h"

#include "gpu/command_buffer/service/command_buffer_service.h"

-#include "gpu/command_buffer/service/context_group.h"

#include "gpu/command_buffer/service/gles2_cmd_decoder.h"

#include "gpu/command_buffer/service/gpu_scheduler.h"

#include "gpu/GLES2/gles2_command_buffer.h"

@@ -109,7 +108,6 @@

using gpu::GpuScheduler;

std::vector<int32> attribs;

- gpu::gles2::ContextGroup::Ref group(new gpu::gles2::ContextGroup(true));

scoped_ptr<GpuScheduler> gpu_scheduler(

GpuScheduler::Create(command_buffer_.get(),

NULL,

@@ -161,8 +159,7 @@

buffer.size,

buffer.ptr,

transfer_buffer_id_,

- share_resources,

- true));

+ share_resources));

context_->CommandBufferEnableCHROMIUM(

PEPPER3D_ALLOW_BUFFERS_ON_MULTIPLE_TARGETS);

« no previous file with comments | « gpu/demos/framework/window.cc ('k') | gpu/gpu.gyp » ('j') | no next file with comments »