| Index: components/mus/gpu/gpu_service_mus.cc
|
| diff --git a/components/mus/gpu/gpu_service_mus.cc b/components/mus/gpu/gpu_service_mus.cc
|
| index 55ff2f9be2da32595012e454a46d8019881b3b7c..09c19cc09a76090a22a08741315f48ea9717eb99 100644
|
| --- a/components/mus/gpu/gpu_service_mus.cc
|
| +++ b/components/mus/gpu/gpu_service_mus.cc
|
| @@ -4,45 +4,113 @@
|
|
|
| #include "components/mus/gpu/gpu_service_mus.h"
|
|
|
| +#include "base/memory/shared_memory.h"
|
| +#include "base/memory/singleton.h"
|
| +#include "base/synchronization/waitable_event.h"
|
| +#include "base/threading/thread_task_runner_handle.h"
|
| +#include "components/mus/gpu/gpu_memory_buffer_manager_mus_local.h"
|
| +#include "gpu/command_buffer/service/gpu_switches.h"
|
| +#include "gpu/command_buffer/service/sync_point_manager.h"
|
| +#include "gpu/config/gpu_info_collector.h"
|
| +#include "gpu/config/gpu_switches.h"
|
| +#include "gpu/config/gpu_util.h"
|
| +#include "gpu/ipc/common/gpu_memory_buffer_support.h"
|
| +#include "gpu/ipc/common/memory_stats.h"
|
| #include "gpu/ipc/common/surface_handle.h"
|
| +#include "gpu/ipc/service/gpu_memory_buffer_factory.h"
|
| +#include "ipc/ipc_channel_handle.h"
|
| +#include "ipc/ipc_sync_message_filter.h"
|
| +#include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
|
| +#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
|
| +#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
|
| +#include "media/gpu/ipc/service/media_service.h"
|
| +#include "ui/gl/gl_implementation.h"
|
| +#include "ui/gl/gl_switches.h"
|
| +#include "ui/gl/gpu_switching_manager.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace mus {
|
| +namespace {
|
|
|
| -GpuServiceMus::GpuServiceMus() {}
|
| +const int kLocalGpuChannelClientId = 1;
|
| +const uint64_t kLocalGpuChannelClientTracingId = 1;
|
|
|
| -GpuServiceMus::~GpuServiceMus() {}
|
| +void EstablishGpuChannelDone(
|
| + std::unique_ptr<IPC::ChannelHandle> channel_handle,
|
| + const GpuServiceMus::EstablishGpuChannelCallback& callback) {
|
| + callback.Run(*channel_handle);
|
| +}
|
| +}
|
| +
|
| +GpuServiceMus::GpuServiceMus()
|
| + : main_message_loop_(base::MessageLoop::current()),
|
| + shutdown_event_(true, false),
|
| + gpu_thread_("GpuThread"),
|
| + io_thread_("GpuIOThread") {
|
| + Initialize();
|
| +}
|
| +
|
| +GpuServiceMus::~GpuServiceMus() {
|
| + // Signal this event before destroying the child process. That way all
|
| + // background threads can cleanup.
|
| + // For example, in the renderer the RenderThread instances will be able to
|
| + // notice shutdown before the render process begins waiting for them to exit.
|
| + shutdown_event_.Signal();
|
| + io_thread_.Stop();
|
| +}
|
|
|
| void GpuServiceMus::EstablishGpuChannel(
|
| - bool prempts,
|
| + int client_id,
|
| + uint64_t client_tracing_id,
|
| + bool preempts,
|
| bool allow_view_command_buffers,
|
| bool allow_real_time_streams,
|
| - const mojom::GpuService::EstablishGpuChannelCallback& callback) {
|
| - NOTIMPLEMENTED();
|
| + const EstablishGpuChannelCallback& callback) {
|
| + DCHECK_GT(client_id, kLocalGpuChannelClientId);
|
| +
|
| + if (!gpu_channel_manager_) {
|
| + callback.Run(IPC::ChannelHandle());
|
| + return;
|
| + }
|
| +
|
| + std::unique_ptr<IPC::ChannelHandle> channel_handle(new IPC::ChannelHandle);
|
| + gpu_thread_.task_runner()->PostTaskAndReply(
|
| + FROM_HERE,
|
| + base::Bind(&GpuServiceMus::EstablishGpuChannelOnGpuThread,
|
| + base::Unretained(this), client_id, client_tracing_id, preempts,
|
| + allow_view_command_buffers, allow_real_time_streams,
|
| + base::Unretained(channel_handle.get())),
|
| + base::Bind(&EstablishGpuChannelDone, base::Passed(&channel_handle),
|
| + callback));
|
| }
|
|
|
| -void GpuServiceMus::CreateGpuMemoryBuffer(
|
| - mojom::GpuMemoryBufferIdPtr id,
|
| +gfx::GpuMemoryBufferHandle GpuServiceMus::CreateGpuMemoryBuffer(
|
| + gfx::GpuMemoryBufferId id,
|
| const gfx::Size& size,
|
| - mojom::BufferFormat format,
|
| - mojom::BufferUsage usage,
|
| - uint64_t surface_id,
|
| - const mojom::GpuService::CreateGpuMemoryBufferCallback& callback) {
|
| - NOTIMPLEMENTED();
|
| + gfx::BufferFormat format,
|
| + gfx::BufferUsage usage,
|
| + int client_id,
|
| + int32_t surface_handle) {
|
| + return gpu_memory_buffer_factory_->CreateGpuMemoryBuffer(
|
| + id, size, format, usage, client_id,
|
| + static_cast<gpu::SurfaceHandle>(surface_handle));
|
| }
|
|
|
| -void GpuServiceMus::CreateGpuMemoryBufferFromHandle(
|
| - mojom::GpuMemoryBufferHandlePtr buffer_handle,
|
| - mojom::GpuMemoryBufferIdPtr id,
|
| +gfx::GpuMemoryBufferHandle GpuServiceMus::CreateGpuMemoryBufferFromeHandle(
|
| + gfx::GpuMemoryBufferHandle buffer_handle,
|
| + gfx::GpuMemoryBufferId id,
|
| const gfx::Size& size,
|
| - mojom::BufferFormat format,
|
| - const mojom::GpuService::CreateGpuMemoryBufferFromHandleCallback&
|
| - callback) {
|
| - NOTIMPLEMENTED();
|
| + gfx::BufferFormat format,
|
| + int client_id) {
|
| + return gpu_memory_buffer_factory_->CreateGpuMemoryBufferFromHandle(
|
| + buffer_handle, id, size, format, client_id);
|
| }
|
|
|
| -void GpuServiceMus::DestroyGpuMemoryBuffer(mojom::GpuMemoryBufferIdPtr id,
|
| +void GpuServiceMus::DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
|
| + int client_id,
|
| const gpu::SyncToken& sync_token) {
|
| - NOTIMPLEMENTED();
|
| + if (gpu_channel_manager_)
|
| + gpu_channel_manager_->DestroyGpuMemoryBuffer(id, client_id, sync_token);
|
| }
|
|
|
| void GpuServiceMus::DidCreateOffscreenContext(const GURL& active_url) {
|
| @@ -50,6 +118,7 @@ void GpuServiceMus::DidCreateOffscreenContext(const GURL& active_url) {
|
| }
|
|
|
| void GpuServiceMus::DidDestroyChannel(int client_id) {
|
| + media_service_->RemoveChannel(client_id);
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| @@ -67,7 +136,7 @@ void GpuServiceMus::GpuMemoryUmaStats(const gpu::GPUMemoryUmaStats& params) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -void GpuServiceMus::StoreShaderToDisk(int32_t client_id,
|
| +void GpuServiceMus::StoreShaderToDisk(int client_id,
|
| const std::string& key,
|
| const std::string& shader) {
|
| NOTIMPLEMENTED();
|
| @@ -85,4 +154,121 @@ void GpuServiceMus::SetActiveURL(const GURL& url) {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| +void GpuServiceMus::Initialize() {
|
| + base::Thread::Options thread_options(base::MessageLoop::TYPE_DEFAULT, 0);
|
| + thread_options.priority = base::ThreadPriority::NORMAL;
|
| + CHECK(gpu_thread_.StartWithOptions(thread_options));
|
| +
|
| + thread_options = base::Thread::Options(base::MessageLoop::TYPE_IO, 0);
|
| + thread_options.priority = base::ThreadPriority::NORMAL;
|
| +#if defined(OS_ANDROID)
|
| + // TODO(reveman): Remove this in favor of setting it explicitly for each type
|
| + // of process.
|
| + thread_options.priority = base::ThreadPriority::DISPLAY;
|
| +#endif
|
| + CHECK(io_thread_.StartWithOptions(thread_options));
|
| +
|
| + IPC::ChannelHandle channel_handle;
|
| + bool manual_reset = true;
|
| + bool initially_signaled = false;
|
| + base::WaitableEvent event(manual_reset, initially_signaled);
|
| + gpu_thread_.task_runner()->PostTask(
|
| + FROM_HERE, base::Bind(&GpuServiceMus::InitializeOnGpuThread,
|
| + base::Unretained(this), &channel_handle, &event));
|
| + event.Wait();
|
| +
|
| + gpu_memory_buffer_manager_mus_local_.reset(new GpuMemoryBufferManagerMusLocal(
|
| + kLocalGpuChannelClientId, kLocalGpuChannelClientTracingId));
|
| + gpu_channel_local_ = gpu::GpuChannelHost::Create(
|
| + this, kLocalGpuChannelClientId, gpu_info_, channel_handle,
|
| + &shutdown_event_, gpu_memory_buffer_manager_mus_local_.get());
|
| +}
|
| +
|
| +void GpuServiceMus::InitializeOnGpuThread(IPC::ChannelHandle* channel_handle,
|
| + base::WaitableEvent* event) {
|
| + gpu_info_.video_decode_accelerator_capabilities =
|
| + media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences_);
|
| + gpu_info_.video_encode_accelerator_supported_profiles =
|
| + media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences_);
|
| + gpu_info_.jpeg_decode_accelerator_supported =
|
| + media::GpuJpegDecodeAccelerator::IsSupported();
|
| +
|
| + if (gpu::GetNativeGpuMemoryBufferType() != gfx::EMPTY_BUFFER) {
|
| + gpu_memory_buffer_factory_ =
|
| + gpu::GpuMemoryBufferFactory::CreateNativeType();
|
| + }
|
| +
|
| + if (!gl::GLSurface::InitializeOneOff())
|
| + VLOG(1) << "gfx::GLSurface::InitializeOneOff failed";
|
| +
|
| + DCHECK(!owned_sync_point_manager_);
|
| + const bool allow_threaded_wait = false;
|
| + owned_sync_point_manager_.reset(
|
| + new gpu::SyncPointManager(allow_threaded_wait));
|
| +
|
| + // Defer creation of the render thread. This is to prevent it from handling
|
| + // IPC messages before the sandbox has been enabled and all other necessary
|
| + // initialization has succeeded.
|
| + // TODO(penghuang): implement a watchdog.
|
| + gpu::GpuWatchdog* watchdog = nullptr;
|
| + gpu_channel_manager_.reset(new gpu::GpuChannelManager(
|
| + gpu_preferences_, this, watchdog,
|
| + base::ThreadTaskRunnerHandle::Get().get(), io_thread_.task_runner().get(),
|
| + &shutdown_event_, owned_sync_point_manager_.get(),
|
| + gpu_memory_buffer_factory_.get()));
|
| +
|
| + media_service_.reset(new media::MediaService(gpu_channel_manager_.get()));
|
| +
|
| +#if defined(USE_OZONE)
|
| + ui::OzonePlatform::GetInstance()
|
| + ->GetGpuPlatformSupport()
|
| + ->OnChannelEstablished(this);
|
| +#endif
|
| + const bool preempts = true;
|
| + const bool allow_view_command_buffers = true;
|
| + const bool allow_real_time_streams = true;
|
| + EstablishGpuChannelOnGpuThread(
|
| + kLocalGpuChannelClientId, kLocalGpuChannelClientTracingId, preempts,
|
| + allow_view_command_buffers, allow_real_time_streams, channel_handle);
|
| + event->Signal();
|
| +}
|
| +
|
| +void GpuServiceMus::EstablishGpuChannelOnGpuThread(
|
| + int client_id,
|
| + uint64_t client_tracing_id,
|
| + bool preempts,
|
| + bool allow_view_command_buffers,
|
| + bool allow_real_time_streams,
|
| + IPC::ChannelHandle* channel_handle) {
|
| + if (gpu_channel_manager_) {
|
| + *channel_handle = gpu_channel_manager_->EstablishChannel(
|
| + client_id, client_tracing_id, preempts, allow_view_command_buffers,
|
| + allow_real_time_streams);
|
| + media_service_->AddChannel(client_id);
|
| + }
|
| +}
|
| +
|
| +bool GpuServiceMus::IsMainThread() {
|
| + return main_message_loop_ == base::MessageLoop::current();
|
| +}
|
| +
|
| +scoped_refptr<base::SingleThreadTaskRunner>
|
| +GpuServiceMus::GetIOThreadTaskRunner() {
|
| + return io_thread_.task_runner();
|
| +}
|
| +
|
| +std::unique_ptr<base::SharedMemory> GpuServiceMus::AllocateSharedMemory(
|
| + size_t size) {
|
| + std::unique_ptr<base::SharedMemory> shm(new base::SharedMemory());
|
| + if (!shm->CreateAnonymous(size))
|
| + return std::unique_ptr<base::SharedMemory>();
|
| + return shm;
|
| +}
|
| +
|
| +// static
|
| +GpuServiceMus* GpuServiceMus::GetInstance() {
|
| + return base::Singleton<GpuServiceMus,
|
| + base::LeakySingletonTraits<GpuServiceMus>>::get();
|
| +}
|
| +
|
| } // namespace mus
|
|
|