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

Unified Diff: gpu/command_buffer/service/in_process_command_buffer.cc

Issue 1386323004: Revert of Added SyncToken command buffer trait to help with IPC messages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/command_buffer/common/sync_token.cc ('k') | gpu/command_buffer/service/mailbox_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/in_process_command_buffer.cc
diff --git a/gpu/command_buffer/service/in_process_command_buffer.cc b/gpu/command_buffer/service/in_process_command_buffer.cc
index a798710d563aafb7917c944efdfa2aabdb3884cc..13fc8adea3fc9ac763dcfa038465a2ae06a07463 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -19,7 +19,7 @@
#include "base/single_thread_task_runner.h"
#include "base/thread_task_runner_handle.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
-#include "gpu/command_buffer/common/sync_token.h"
+#include "gpu/command_buffer/common/gles2_cmd_format.h"
#include "gpu/command_buffer/common/value_state.h"
#include "gpu/command_buffer/service/command_buffer_service.h"
#include "gpu/command_buffer/service/context_group.h"
@@ -817,7 +817,8 @@
// We can simply use the GPUIO namespace with 0 for the command buffer ID
// (under normal circumstances 0 is invalid so will not be used) until
// the old sync points are replaced.
- SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, sync_point);
+ gles2::SyncToken sync_token = {gpu::CommandBufferNamespace::GPU_IO, 0,
+ sync_point};
mailbox_manager->PushTextureUpdates(sync_token);
}
}
@@ -841,7 +842,8 @@
// We can simply use the GPUIO namespace with 0 for the command buffer ID
// (under normal circumstances 0 is invalid so will not be used) until
// the old sync points are replaced.
- SyncToken sync_token(gpu::CommandBufferNamespace::GPU_IO, 0, sync_point);
+ gles2::SyncToken sync_token = {gpu::CommandBufferNamespace::GPU_IO, 0,
+ sync_point};
mailbox_manager->PullTextureUpdates(sync_token);
return true;
}
@@ -857,7 +859,8 @@
make_current_success = MakeCurrent();
}
if (make_current_success) {
- SyncToken sync_token(GetNamespaceID(), GetCommandBufferID(), release);
+ gles2::SyncToken sync_token = {GetNamespaceID(), GetCommandBufferID(),
+ release};
mailbox_manager->PushTextureUpdates(sync_token);
}
}
@@ -890,7 +893,7 @@
gles2::MailboxManager* mailbox_manager =
decoder_->GetContextGroup()->mailbox_manager();
- SyncToken sync_token(namespace_id, command_buffer_id, release);
+ gles2::SyncToken sync_token = {namespace_id, command_buffer_id, release};
mailbox_manager->PullTextureUpdates(sync_token);
return true;
}
« no previous file with comments | « gpu/command_buffer/common/sync_token.cc ('k') | gpu/command_buffer/service/mailbox_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698