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

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

Issue 1920163005: Split //ui/gl into //ui/gl + //ui/gi/init. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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/service/BUILD.gn ('k') | gpu/command_buffer/tests/gl_manager.cc » ('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 5d4bb0cd97b45af45b7dac7e39e24078aaeb1a19..22d246856e7c01347aa5d22526a088ff50e5621a 100644
--- a/gpu/command_buffer/service/in_process_command_buffer.cc
+++ b/gpu/command_buffer/service/in_process_command_buffer.cc
@@ -44,6 +44,7 @@
#include "ui/gl/gl_image.h"
#include "ui/gl/gl_image_shared_memory.h"
#include "ui/gl/gl_share_group.h"
+#include "ui/gl/init/gl_factory.h"
#if defined(OS_WIN)
#include <windows.h>
@@ -342,9 +343,9 @@ bool InProcessCommandBuffer::InitializeOnGpuThread(
if (!surface_.get()) {
if (params.is_offscreen)
- surface_ = gfx::GLSurface::CreateOffscreenGLSurface(params.size);
+ surface_ = gl::init::CreateOffscreenGLSurface(params.size);
else
- surface_ = gfx::GLSurface::CreateViewGLSurface(params.window);
+ surface_ = gl::init::CreateViewGLSurface(params.window);
}
if (!surface_.get()) {
@@ -364,7 +365,7 @@ bool InProcessCommandBuffer::InitializeOnGpuThread(
.use_virtualized_gl_contexts) {
context_ = gl_share_group_->GetSharedContext();
if (!context_.get()) {
- context_ = gfx::GLContext::CreateGLContext(
+ context_ = gl::init::CreateGLContext(
gl_share_group_.get(), surface_.get(), params.gpu_preference);
gl_share_group_->SetSharedContext(context_.get());
}
@@ -377,8 +378,8 @@ bool InProcessCommandBuffer::InitializeOnGpuThread(
context_ = NULL;
}
} else {
- context_ = gfx::GLContext::CreateGLContext(
- gl_share_group_.get(), surface_.get(), params.gpu_preference);
+ context_ = gl::init::CreateGLContext(gl_share_group_.get(), surface_.get(),
+ params.gpu_preference);
}
if (!context_.get()) {
« no previous file with comments | « gpu/command_buffer/service/BUILD.gn ('k') | gpu/command_buffer/tests/gl_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698