summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-11 09:35:19 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-11 09:35:19 +0000
commit322099e0cdfb35bf2ce63108a29aa4c449aa34e2 (patch)
treeb3448b1efb76694182f945a5c86aa5ea60eb834c
parentb88f76a122b139757229e01a090777e32512d7b5 (diff)
downloadchromium_src-322099e0cdfb35bf2ce63108a29aa4c449aa34e2.zip
chromium_src-322099e0cdfb35bf2ce63108a29aa4c449aa34e2.tar.gz
chromium_src-322099e0cdfb35bf2ce63108a29aa4c449aa34e2.tar.bz2
Remove --enable-prune-gpu-command-buffers
This isn't set anywhere. Remove corresponding feature. BUG=350489 Review URL: https://codereview.chromium.org/189143007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256162 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc1
-rw-r--r--content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc5
-rw-r--r--content/public/common/content_switches.cc4
-rw-r--r--content/public/common/content_switches.h1
-rw-r--r--gpu/command_buffer/client/gl_in_process_context.cc2
-rw-r--r--gpu/command_buffer/client/gles2_implementation.cc8
-rw-r--r--gpu/command_buffer/client/gles2_implementation.h4
-rw-r--r--gpu/command_buffer/client/gles2_implementation_unittest.cc1
-rw-r--r--gpu/command_buffer/tests/gl_manager.cc3
-rw-r--r--gpu/gles2_conform_support/egl/display.cc2
-rw-r--r--mojo/gles2/gles2_context.cc1
-rw-r--r--ppapi/shared_impl/ppb_graphics_3d_shared.cc2
12 files changed, 0 insertions, 34 deletions
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 0c9a7c0..cb4fbe4 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -1050,7 +1050,6 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
switches::kEnableOverscrollNotifications,
switches::kEnablePinch,
switches::kEnablePreparsedJsCaching,
- switches::kEnablePruneGpuCommandBuffers,
switches::kEnableRepaintAfterLayout,
switches::kEnableServiceWorker,
switches::kEnableSkiaBenchmarking,
diff --git a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
index be4e5c2..4b91c42 100644
--- a/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc
@@ -423,17 +423,12 @@ bool WebGraphicsContext3DCommandBufferImpl::CreateContext(bool onscreen) {
DCHECK(host_.get());
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- bool free_command_buffer_when_invisible =
- command_line.HasSwitch(switches::kEnablePruneGpuCommandBuffers);
-
// Create the object exposing the OpenGL API.
real_gl_.reset(new gpu::gles2::GLES2Implementation(
gles2_helper_.get(),
gles2_share_group,
transfer_buffer_.get(),
bind_generates_resources_,
- free_command_buffer_when_invisible,
command_buffer_.get()));
gl_ = real_gl_.get();
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 2cf2112..84e85f5 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -531,10 +531,6 @@ const char kEnablePreparsedJsCaching[] = "enable-preparsed-js-caching";
const char kEnablePrivilegedWebGLExtensions[] =
"enable-privileged-webgl-extensions";
-// Aggressively free GPU command buffers belonging to hidden tabs.
-const char kEnablePruneGpuCommandBuffers[] =
- "enable-prune-gpu-command-buffers";
-
// Enables the CSS multicol implementation that uses the regions implementation.
const char kEnableRegionBasedColumns[] =
"enable-region-based-columns";
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index f45726f..f628b16 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -158,7 +158,6 @@ CONTENT_EXPORT extern const char kEnableOverscrollNotifications[];
CONTENT_EXPORT extern const char kEnablePinch[];
extern const char kEnablePreparsedJsCaching[];
CONTENT_EXPORT extern const char kEnablePrivilegedWebGLExtensions[];
-extern const char kEnablePruneGpuCommandBuffers[];
CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
CONTENT_EXPORT extern const char kEnableRepaintAfterLayout[];
CONTENT_EXPORT extern const char kEnableSandboxLogging[];
diff --git a/gpu/command_buffer/client/gl_in_process_context.cc b/gpu/command_buffer/client/gl_in_process_context.cc
index d9a258e..1db894f 100644
--- a/gpu/command_buffer/client/gl_in_process_context.cc
+++ b/gpu/command_buffer/client/gl_in_process_context.cc
@@ -243,7 +243,6 @@ bool GLInProcessContextImpl::Initialize(
transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get()));
bool bind_generates_resources = false;
- bool free_everything_when_invisible = false;
// Create the object exposing the OpenGL API.
gles2_implementation_.reset(new gles2::GLES2Implementation(
@@ -251,7 +250,6 @@ bool GLInProcessContextImpl::Initialize(
share_group,
transfer_buffer_.get(),
bind_generates_resources,
- free_everything_when_invisible,
command_buffer_.get()));
if (use_global_share_group) {
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index c0bf495..e0b0cb8 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -86,7 +86,6 @@ GLES2Implementation::GLES2Implementation(
ShareGroup* share_group,
TransferBufferInterface* transfer_buffer,
bool bind_generates_resource,
- bool free_everything_when_invisible,
GpuControl* gpu_control)
: helper_(helper),
transfer_buffer_(transfer_buffer),
@@ -112,8 +111,6 @@ GLES2Implementation::GLES2Implementation(
use_count_(0),
error_message_callback_(NULL),
gpu_control_(gpu_control),
- surface_visible_(true),
- free_everything_when_invisible_(free_everything_when_invisible),
capabilities_(gpu_control->GetCapabilities()),
weak_ptr_factory_(this) {
DCHECK(helper);
@@ -346,7 +343,6 @@ void GLES2Implementation::SignalQuery(uint32 query,
void GLES2Implementation::SetSurfaceVisible(bool visible) {
// TODO(piman): This probably should be ShallowFlushCHROMIUM().
Flush();
- surface_visible_ = visible;
gpu_control_->SetSurfaceVisible(visible);
if (!visible)
FreeEverything();
@@ -850,8 +846,6 @@ void GLES2Implementation::Flush() {
// Flush our command buffer
// (tell the service to execute up to the flush cmd.)
helper_->CommandBufferHelper::Flush();
- if (!surface_visible_ && free_everything_when_invisible_)
- FreeEverything();
}
void GLES2Implementation::ShallowFlushCHROMIUM() {
@@ -866,8 +860,6 @@ void GLES2Implementation::ShallowFlushCHROMIUM() {
void GLES2Implementation::Finish() {
GPU_CLIENT_SINGLE_THREAD_CHECK();
FinishHelper();
- if (!surface_visible_ && free_everything_when_invisible_)
- FreeEverything();
}
void GLES2Implementation::ShallowFinishCHROMIUM() {
diff --git a/gpu/command_buffer/client/gles2_implementation.h b/gpu/command_buffer/client/gles2_implementation.h
index 800d9f3..314261f 100644
--- a/gpu/command_buffer/client/gles2_implementation.h
+++ b/gpu/command_buffer/client/gles2_implementation.h
@@ -185,7 +185,6 @@ class GLES2_IMPL_EXPORT GLES2Implementation
ShareGroup* share_group,
TransferBufferInterface* transfer_buffer,
bool bind_generates_resource,
- bool free_everything_when_invisible,
GpuControl* gpu_control);
virtual ~GLES2Implementation();
@@ -716,9 +715,6 @@ class GLES2_IMPL_EXPORT GLES2Implementation
GpuControl* gpu_control_;
- bool surface_visible_;
- bool free_everything_when_invisible_;
-
Capabilities capabilities_;
bool use_echo_for_swap_ack_;
diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc
index a2352be..3e9acb1 100644
--- a/gpu/command_buffer/client/gles2_implementation_unittest.cc
+++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc
@@ -444,7 +444,6 @@ class GLES2ImplementationTest : public testing::Test {
share_group,
transfer_buffer_.get(),
bind_generates_resource,
- false /* free_everything_when_invisible */,
gpu_control_.get()));
ASSERT_TRUE(gl_->Initialize(kTransferBufferSize,
kTransferBufferSize,
diff --git a/gpu/command_buffer/tests/gl_manager.cc b/gpu/command_buffer/tests/gl_manager.cc
index db0c4c6..e8d6452 100644
--- a/gpu/command_buffer/tests/gl_manager.cc
+++ b/gpu/command_buffer/tests/gl_manager.cc
@@ -188,15 +188,12 @@ void GLManager::Initialize(const GLManager::Options& options) {
// Create a transfer buffer.
transfer_buffer_.reset(new TransferBuffer(gles2_helper_.get()));
- bool free_everything_when_invisible = false;
-
// Create the object exposing the OpenGL API.
gles2_implementation_.reset(new gles2::GLES2Implementation(
gles2_helper_.get(),
client_share_group,
transfer_buffer_.get(),
options.bind_generates_resource,
- free_everything_when_invisible ,
gpu_control_.get()));
ASSERT_TRUE(gles2_implementation_->Initialize(
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index 73fb185..9885cd6 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -229,14 +229,12 @@ EGLContext Display::CreateContext(EGLConfig config,
DCHECK(transfer_buffer_.get());
bool bind_generates_resources = true;
- bool free_everything_when_invisible = false;
context_.reset(new gpu::gles2::GLES2Implementation(
gles2_cmd_helper_.get(),
NULL,
transfer_buffer_.get(),
bind_generates_resources,
- free_everything_when_invisible,
gpu_control_.get()));
if (!context_->Initialize(
diff --git a/mojo/gles2/gles2_context.cc b/mojo/gles2/gles2_context.cc
index 195ec60..1cff999 100644
--- a/mojo/gles2/gles2_context.cc
+++ b/mojo/gles2/gles2_context.cc
@@ -45,7 +45,6 @@ bool GLES2Context::Initialize() {
NULL,
transfer_buffer_.get(),
true,
- true,
&command_buffer_));
return implementation_->Initialize(kDefaultStartTransferBufferSize,
kDefaultMinTransferBufferSize,
diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.cc b/ppapi/shared_impl/ppb_graphics_3d_shared.cc
index 74076ba..b4e258b 100644
--- a/ppapi/shared_impl/ppb_graphics_3d_shared.cc
+++ b/ppapi/shared_impl/ppb_graphics_3d_shared.cc
@@ -118,7 +118,6 @@ bool PPB_Graphics3D_Shared::CreateGLES2Impl(
transfer_buffer_.reset(new gpu::TransferBuffer(gles2_helper_.get()));
const bool bind_creates_resources = true;
- const bool free_everything_when_invisible = false;
// Create the object exposing the OpenGL API.
gles2_impl_.reset(new gpu::gles2::GLES2Implementation(
@@ -126,7 +125,6 @@ bool PPB_Graphics3D_Shared::CreateGLES2Impl(
share_gles2 ? share_gles2->share_group() : NULL,
transfer_buffer_.get(),
bind_creates_resources,
- free_everything_when_invisible,
GetGpuControl()));
if (!gles2_impl_->Initialize(