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

Unified Diff: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc

Issue 267683008: ChromeOS only version of r261563 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/
Patch Set: Created 6 years, 8 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: content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
===================================================================
--- content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc (revision 267947)
+++ content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc (working copy)
@@ -229,7 +229,9 @@
const GURL& active_url,
GpuChannelHost* host,
const Attributes& attributes,
+#if !defined(OS_CHROMEOS)
bool bind_generates_resources,
+#endif
bool lose_context_when_out_of_memory,
const SharedMemoryLimits& limits,
WebGraphicsContext3DCommandBufferImpl* share_context)
@@ -247,7 +249,9 @@
weak_ptr_factory_(this),
initialized_(false),
gl_(NULL),
+#if !defined(OS_CHROMEOS)
bind_generates_resources_(bind_generates_resources),
+#endif
lose_context_when_out_of_memory_(lose_context_when_out_of_memory),
mem_limits_(limits),
flush_id_(0) {
@@ -354,6 +358,10 @@
attribs.push_back(attributes_.failIfMajorPerformanceCaveat ? 1 : 0);
attribs.push_back(LOSE_CONTEXT_WHEN_OUT_OF_MEMORY);
attribs.push_back(lose_context_when_out_of_memory_ ? 1 : 0);
+#if defined(OS_CHROMEOS)
+ attribs.push_back(BIND_GENERATES_RESOURCES);
+ attribs.push_back(0);
+#endif
attribs.push_back(NONE);
// Create a proxy to a command buffer in the GPU process.
@@ -428,11 +436,19 @@
DCHECK(host_.get());
// Create the object exposing the OpenGL API.
+#if defined(OS_CHROMEOS)
+ bool bind_generates_resources = false;
+#endif
+
real_gl_.reset(
new gpu::gles2::GLES2Implementation(gles2_helper_.get(),
gles2_share_group,
transfer_buffer_.get(),
+#if defined(OS_CHROMEOS)
+ bind_generates_resources,
+#else
bind_generates_resources_,
+#endif
lose_context_when_out_of_memory_,
command_buffer_.get()));
gl_ = real_gl_.get();
@@ -1205,14 +1221,17 @@
if (share_context && share_context->IsCommandBufferContextLost())
return NULL;
-
+#if !defined(OS_CHROMEOS)
bool bind_generates_resources = false;
+#endif
return new WebGraphicsContext3DCommandBufferImpl(
0,
active_url,
host,
attributes,
+#if !defined(OS_CHROMEOS)
bind_generates_resources,
+#endif
lose_context_when_out_of_memory,
limits,
share_context);
« no previous file with comments | « content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h ('k') | content/common/gpu/gpu_command_buffer_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698