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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7758004: Manually merging trunk revs 95836 and 96904 to 835 branch. (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
« no previous file with comments | « gpu/demos/framework/window.cc ('k') | gpu/gpu.gyp » ('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
===================================================================
--- gpu/gles2_conform_support/egl/display.cc (revision 98314)
+++ gpu/gles2_conform_support/egl/display.cc (working copy)
@@ -108,6 +108,7 @@
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,
@@ -159,7 +160,8 @@
buffer.size,
buffer.ptr,
transfer_buffer_id_,
- share_resources));
+ share_resources,
+ true));
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 »

Powered by Google App Engine
This is Rietveld 408576698