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

Unified Diff: components/mus/gles2/command_buffer_local.cc

Issue 1885903002: Revert of Make lost context and error message callbacks on GpuControl go to client (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
« no previous file with comments | « components/mus/gles2/command_buffer_local.h ('k') | components/mus/gles2/command_buffer_local_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/gles2/command_buffer_local.cc
diff --git a/components/mus/gles2/command_buffer_local.cc b/components/mus/gles2/command_buffer_local.cc
index ba2f12db9e02d033bc65ae26dba2898b3bf96ea7..23a8fd1e50fdae5a3e34160fa76ca384c2e2174e 100644
--- a/components/mus/gles2/command_buffer_local.cc
+++ b/components/mus/gles2/command_buffer_local.cc
@@ -16,7 +16,6 @@
#include "components/mus/gles2/gpu_state.h"
#include "components/mus/gles2/mojo_buffer_backing.h"
#include "components/mus/gles2/mojo_gpu_memory_buffer.h"
-#include "gpu/command_buffer/client/gpu_control_client.h"
#include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
#include "gpu/command_buffer/common/sync_token.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
@@ -77,12 +76,10 @@
gpu_state_(gpu_state),
client_(client),
client_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
- gpu_control_client_(nullptr),
next_transfer_buffer_id_(0),
next_image_id_(0),
next_fence_sync_release_(1),
flushed_fence_sync_release_(0),
- lost_context_(false),
sync_point_client_waiter_(
gpu_state->sync_point_manager()->CreateSyncPointClientWaiter()),
weak_factory_(this) {
@@ -217,10 +214,6 @@
driver_.get(),
base::Bind(&CommandBufferLocal::DestroyTransferBufferOnGpuThread,
base::Unretained(this), id));
-}
-
-void CommandBufferLocal::SetGpuControlClient(gpu::GpuControlClient* client) {
- gpu_control_client_ = client;
}
gpu::Capabilities CommandBufferLocal::GetCapabilities() {
@@ -548,10 +541,8 @@
}
void CommandBufferLocal::DidLoseContextOnClientThread(uint32_t reason) {
- DCHECK(gpu_control_client_);
- if (!lost_context_)
- gpu_control_client_->OnGpuControlLostContext();
- lost_context_ = true;
+ if (client_)
+ client_->DidLoseContext();
}
void CommandBufferLocal::UpdateVSyncParametersOnClientThread(int64_t timebase,
« no previous file with comments | « components/mus/gles2/command_buffer_local.h ('k') | components/mus/gles2/command_buffer_local_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698