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

Unified Diff: components/mus/public/cpp/lib/gles2_context.cc

Issue 1976703003: Impl mus::mojom::GpuService to enable using Chrome IPC version gpu CmdBuf in mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 6 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
Index: components/mus/public/cpp/lib/gles2_context.cc
diff --git a/components/mus/public/cpp/lib/gles2_context.cc b/components/mus/public/cpp/lib/gles2_context.cc
index 463f1cd3d27c32bacd3009fe66e388a169b8eb76..6d8670bcfc2661837d763db11135fe0462616ce1 100644
--- a/components/mus/public/cpp/lib/gles2_context.cc
+++ b/components/mus/public/cpp/lib/gles2_context.cc
@@ -9,31 +9,76 @@
#include <utility>
+#include "components/mus/public/cpp/lib/command_buffer_client_impl.h"
+#include "components/mus/public/cpp/lib/gpu_service.h"
+#include "components/mus/public/interfaces/command_buffer.mojom.h"
+#include "components/mus/public/interfaces/gpu_service.mojom.h"
#include "gpu/command_buffer/client/gles2_cmd_helper.h"
-#include "gpu/command_buffer/client/gles2_implementation.h"
#include "gpu/command_buffer/client/shared_memory_limits.h"
#include "gpu/command_buffer/client/transfer_buffer.h"
+#include "gpu/ipc/client/command_buffer_proxy_impl.h"
#include "mojo/public/cpp/system/core.h"
+#include "services/shell/public/cpp/connector.h"
+#include "url/gurl.h"
namespace mus {
-GLES2Context::GLES2Context(const std::vector<int32_t>& attribs,
- mus::mojom::CommandBufferPtr command_buffer_ptr)
- : command_buffer_(attribs, std::move(command_buffer_ptr)) {}
+GLES2Context::GLES2Context() {}
GLES2Context::~GLES2Context() {}
-bool GLES2Context::Initialize() {
- if (!command_buffer_.Initialize())
- return false;
+bool GLES2Context::Initialize(const std::vector<int32_t>& attribs,
+ shell::Connector* connector) {
+ gpu::CommandBuffer* command_buffer = nullptr;
+ gpu::GpuControl* gpu_control = nullptr;
+ // TODO(penghuang): Use type gpu::gles2::ContextCreationAttribHelper for
+ // attribs.
+ if (!mus::GpuService::UseChromeGpuCommandBuffer()) {
+ mojom::GpuPtr gpu;
+ connector->ConnectToInterface("mojo:mus", &gpu);
+ mojom::CommandBufferPtr command_buffer_ptr;
+ gpu->CreateOffscreenGLES2Context(GetProxy(&command_buffer_ptr));
+ command_buffer_client_impl_.reset(
+ new CommandBufferClientImpl(attribs, std::move(command_buffer_ptr)));
+ if (!command_buffer_client_impl_->Initialize())
+ return false;
+ command_buffer = command_buffer_client_impl_.get();
+ gpu_control = command_buffer_client_impl_.get();
+ } else {
+ scoped_refptr<gpu::GpuChannelHost> gpu_channel_host =
+ GpuService::GetInstance()->EstablishGpuChannel(connector);
+ if (!gpu_channel_host)
+ return false;
+ gpu::SurfaceHandle surface_handle = gfx::kNullAcceleratedWidget;
+ // TODO(penghuang): support shared group.
+ gpu::CommandBufferProxyImpl* shared_command_buffer = nullptr;
+ gpu::GpuStreamId stream_id = gpu::GpuStreamId::GPU_STREAM_DEFAULT;
+ gpu::GpuStreamPriority stream_priority = gpu::GpuStreamPriority::NORMAL;
+ gl::GpuPreference gpu_preference = gl::PreferIntegratedGpu;
+ gpu::gles2::ContextCreationAttribHelper attributes;
+ // TODO(penghuang): figure a useful active_url.
+ GURL active_url;
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner =
+ base::ThreadTaskRunnerHandle::Get();
+ if (!attributes.Parse(attribs))
+ return false;
+ command_buffer_proxy_impl_ = gpu::CommandBufferProxyImpl::Create(
+ std::move(gpu_channel_host), surface_handle, gfx::Size(),
+ shared_command_buffer, stream_id, stream_priority, attributes,
+ active_url, gpu_preference, std::move(task_runner));
+ if (!command_buffer_proxy_impl_)
+ return false;
+ command_buffer = command_buffer_proxy_impl_.get();
+ gpu_control = command_buffer_proxy_impl_.get();
+ }
constexpr gpu::SharedMemoryLimits default_limits;
- gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(&command_buffer_));
+ gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer));
if (!gles2_helper_->Initialize(default_limits.command_buffer_size))
return false;
gles2_helper_->SetAutomaticFlushes(false);
transfer_buffer_.reset(new gpu::TransferBuffer(gles2_helper_.get()));
- gpu::Capabilities capabilities = command_buffer_.GetCapabilities();
+ gpu::Capabilities capabilities = gpu_control->GetCapabilities();
bool bind_generates_resource =
!!capabilities.bind_generates_resource_chromium;
// TODO(piman): Some contexts (such as compositor) want this to be true, so
@@ -43,7 +88,7 @@ bool GLES2Context::Initialize() {
implementation_.reset(new gpu::gles2::GLES2Implementation(
gles2_helper_.get(), NULL, transfer_buffer_.get(),
bind_generates_resource, lose_context_when_out_of_memory,
- support_client_side_arrays, &command_buffer_));
+ support_client_side_arrays, gpu_control));
if (!implementation_->Initialize(default_limits.start_transfer_buffer_size,
default_limits.min_transfer_buffer_size,
default_limits.max_transfer_buffer_size,
@@ -52,4 +97,14 @@ bool GLES2Context::Initialize() {
return true;
}
+// static
+std::unique_ptr<GLES2Context> GLES2Context::CreateOffscreenContext(
+ const std::vector<int32_t>& attribs,
+ shell::Connector* connector) {
+ std::unique_ptr<GLES2Context> gles2_context(new GLES2Context);
+ if (!gles2_context->Initialize(attribs, connector))
+ gles2_context.reset();
+ return gles2_context;
+}
+
} // namespace mus
« no previous file with comments | « components/mus/public/cpp/lib/context_provider.cc ('k') | components/mus/public/cpp/lib/gpu_memory_buffer_manager_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698