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

Side by Side Diff: gpu/ipc/service/gpu_command_buffer_stub.cc

Issue 2383753002: gpu: Add GpuFence framework.
Patch Set: rebase Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "gpu/ipc/service/gpu_command_buffer_stub.h" 5 #include "gpu/ipc/service/gpu_command_buffer_stub.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/hash.h" 11 #include "base/hash.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/memory/shared_memory.h" 15 #include "base/memory/shared_memory.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "base/trace_event/trace_event.h" 17 #include "base/trace_event/trace_event.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "gpu/command_buffer/common/constants.h" 19 #include "gpu/command_buffer/common/constants.h"
20 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h" 20 #include "gpu/command_buffer/common/gpu_memory_buffer_support.h"
21 #include "gpu/command_buffer/common/mailbox.h" 21 #include "gpu/command_buffer/common/mailbox.h"
22 #include "gpu/command_buffer/common/sync_token.h" 22 #include "gpu/command_buffer/common/sync_token.h"
23 #include "gpu/command_buffer/service/fence_manager.h"
23 #include "gpu/command_buffer/service/gl_context_virtual.h" 24 #include "gpu/command_buffer/service/gl_context_virtual.h"
24 #include "gpu/command_buffer/service/gl_state_restorer_impl.h" 25 #include "gpu/command_buffer/service/gl_state_restorer_impl.h"
25 #include "gpu/command_buffer/service/image_manager.h" 26 #include "gpu/command_buffer/service/image_manager.h"
26 #include "gpu/command_buffer/service/logger.h" 27 #include "gpu/command_buffer/service/logger.h"
27 #include "gpu/command_buffer/service/mailbox_manager.h" 28 #include "gpu/command_buffer/service/mailbox_manager.h"
28 #include "gpu/command_buffer/service/memory_tracking.h" 29 #include "gpu/command_buffer/service/memory_tracking.h"
29 #include "gpu/command_buffer/service/query_manager.h" 30 #include "gpu/command_buffer/service/query_manager.h"
30 #include "gpu/command_buffer/service/service_utils.h" 31 #include "gpu/command_buffer/service/service_utils.h"
31 #include "gpu/command_buffer/service/sync_point_manager.h" 32 #include "gpu/command_buffer/service/sync_point_manager.h"
32 #include "gpu/command_buffer/service/transfer_buffer_manager.h" 33 #include "gpu/command_buffer/service/transfer_buffer_manager.h"
33 #include "gpu/ipc/common/gpu_messages.h" 34 #include "gpu/ipc/common/gpu_messages.h"
34 #include "gpu/ipc/service/gpu_channel.h" 35 #include "gpu/ipc/service/gpu_channel.h"
35 #include "gpu/ipc/service/gpu_channel_manager.h" 36 #include "gpu/ipc/service/gpu_channel_manager.h"
36 #include "gpu/ipc/service/gpu_channel_manager_delegate.h" 37 #include "gpu/ipc/service/gpu_channel_manager_delegate.h"
37 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" 38 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
38 #include "gpu/ipc/service/gpu_memory_manager.h" 39 #include "gpu/ipc/service/gpu_memory_manager.h"
39 #include "gpu/ipc/service/gpu_memory_tracking.h" 40 #include "gpu/ipc/service/gpu_memory_tracking.h"
40 #include "gpu/ipc/service/gpu_watchdog_thread.h" 41 #include "gpu/ipc/service/gpu_watchdog_thread.h"
41 #include "gpu/ipc/service/image_transport_surface.h" 42 #include "gpu/ipc/service/image_transport_surface.h"
42 #include "ui/gl/gl_bindings.h" 43 #include "ui/gl/gl_bindings.h"
43 #include "ui/gl/gl_context.h" 44 #include "ui/gl/gl_context.h"
45 #include "ui/gl/gl_fence.h"
44 #include "ui/gl/gl_image.h" 46 #include "ui/gl/gl_image.h"
45 #include "ui/gl/gl_implementation.h" 47 #include "ui/gl/gl_implementation.h"
46 #include "ui/gl/gl_switches.h" 48 #include "ui/gl/gl_switches.h"
47 #include "ui/gl/init/gl_factory.h" 49 #include "ui/gl/init/gl_factory.h"
48 50
49 #if defined(OS_WIN) 51 #if defined(OS_WIN)
50 #include "base/win/win_util.h" 52 #include "base/win/win_util.h"
51 #endif 53 #endif
52 54
53 #if defined(OS_ANDROID) 55 #if defined(OS_ANDROID)
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_WaitSyncToken, 251 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_WaitSyncToken,
250 OnWaitSyncToken) 252 OnWaitSyncToken)
251 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalSyncToken, 253 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalSyncToken,
252 OnSignalSyncToken) 254 OnSignalSyncToken)
253 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalQuery, 255 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_SignalQuery,
254 OnSignalQuery) 256 OnSignalQuery)
255 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateImage, OnCreateImage); 257 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateImage, OnCreateImage);
256 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DestroyImage, OnDestroyImage); 258 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DestroyImage, OnDestroyImage);
257 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateStreamTexture, 259 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateStreamTexture,
258 OnCreateStreamTexture) 260 OnCreateStreamTexture)
261 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_CreateFence, OnCreateFence);
262 IPC_MESSAGE_HANDLER(GpuCommandBufferMsg_DestroyFence, OnDestroyFence);
259 IPC_MESSAGE_UNHANDLED(handled = false) 263 IPC_MESSAGE_UNHANDLED(handled = false)
260 IPC_END_MESSAGE_MAP() 264 IPC_END_MESSAGE_MAP()
261 265
262 CheckCompleteWaits(); 266 CheckCompleteWaits();
263 267
264 // Ensure that any delayed work that was created will be handled. 268 // Ensure that any delayed work that was created will be handled.
265 if (have_context) { 269 if (have_context) {
266 if (executor_) 270 if (executor_)
267 executor_->ProcessPendingQueries(); 271 executor_->ProcessPendingQueries();
268 ScheduleDelayedWork( 272 ScheduleDelayedWork(
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 gles2::ImageManager* image_manager = decoder_->GetImageManager(); 1076 gles2::ImageManager* image_manager = decoder_->GetImageManager();
1073 DCHECK(image_manager); 1077 DCHECK(image_manager);
1074 if (!image_manager->LookupImage(id)) { 1078 if (!image_manager->LookupImage(id)) {
1075 LOG(ERROR) << "Image with ID doesn't exist."; 1079 LOG(ERROR) << "Image with ID doesn't exist.";
1076 return; 1080 return;
1077 } 1081 }
1078 1082
1079 image_manager->RemoveImage(id); 1083 image_manager->RemoveImage(id);
1080 } 1084 }
1081 1085
1086 void GpuCommandBufferStub::OnCreateFence(
1087 const GpuCommandBufferMsg_CreateFence_Params& params) {
1088 TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnCreateFence");
1089 const int32_t id = params.id;
1090 const gfx::GpuFenceHandle& handle = params.gpu_fence;
1091
1092 if (!decoder_)
1093 return;
1094
1095 gles2::FenceManager* fence_manager = decoder_->GetFenceManager();
1096 DCHECK(fence_manager);
1097 if (fence_manager->LookupFence(id)) {
1098 LOG(ERROR) << "Fence already exists with same ID.";
1099 return;
1100 }
1101
1102 std::unique_ptr<gl::GLFence> fence =
1103 channel()->CreateFenceForGpuFence(handle);
1104 if (!fence) {
1105 DLOG(ERROR) << "Failed to create GLFence from GpuFence handle.";
1106 return;
1107 }
1108
1109 fence_manager->AddFence(std::move(fence), id);
1110 }
1111
1112 void GpuCommandBufferStub::OnDestroyFence(int32_t id) {
1113 TRACE_EVENT0("gpu", "GpuCommandBufferStub::OnDestroyFence");
1114
1115 if (!decoder_)
1116 return;
1117
1118 gles2::FenceManager* fence_manager = decoder_->GetFenceManager();
1119 DCHECK(fence_manager);
1120 if (!fence_manager->LookupFence(id)) {
1121 LOG(ERROR) << "Fence with ID doesn't exist.";
1122 return;
1123 }
1124 fence_manager->RemoveFence(id);
1125 }
1126
1082 void GpuCommandBufferStub::SendConsoleMessage(int32_t id, 1127 void GpuCommandBufferStub::SendConsoleMessage(int32_t id,
1083 const std::string& message) { 1128 const std::string& message) {
1084 GPUCommandBufferConsoleMessage console_message; 1129 GPUCommandBufferConsoleMessage console_message;
1085 console_message.id = id; 1130 console_message.id = id;
1086 console_message.message = message; 1131 console_message.message = message;
1087 IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg( 1132 IPC::Message* msg = new GpuCommandBufferMsg_ConsoleMsg(
1088 route_id_, console_message); 1133 route_id_, console_message);
1089 msg->set_unblock(true); 1134 msg->set_unblock(true);
1090 Send(msg); 1135 Send(msg);
1091 } 1136 }
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1142 command_buffer_->GetLastState().error == error::kLostContext) 1187 command_buffer_->GetLastState().error == error::kLostContext)
1143 return; 1188 return;
1144 1189
1145 command_buffer_->SetContextLostReason(error::kUnknown); 1190 command_buffer_->SetContextLostReason(error::kUnknown);
1146 if (decoder_) 1191 if (decoder_)
1147 decoder_->MarkContextLost(error::kUnknown); 1192 decoder_->MarkContextLost(error::kUnknown);
1148 command_buffer_->SetParseError(error::kLostContext); 1193 command_buffer_->SetParseError(error::kLostContext);
1149 } 1194 }
1150 1195
1151 } // namespace gpu 1196 } // namespace gpu
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698