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

Unified Diff: gpu/ipc/service/gpu_channel_manager.cc

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (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/ipc/service/gpu_channel_manager.h ('k') | gpu/ipc/service/gpu_channel_test_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/ipc/service/gpu_channel_manager.cc
diff --git a/gpu/ipc/service/gpu_channel_manager.cc b/gpu/ipc/service/gpu_channel_manager.cc
index 04487ede931b1a733ec2c94045f13246d348eb18..aba548601aff4d552eb914b39b239d9896b1929c 100644
--- a/gpu/ipc/service/gpu_channel_manager.cc
+++ b/gpu/ipc/service/gpu_channel_manager.cc
@@ -58,7 +58,7 @@ GpuChannelManager::GpuChannelManager(
delegate_(delegate),
watchdog_(watchdog),
shutdown_event_(shutdown_event),
- share_group_(new gfx::GLShareGroup),
+ share_group_(new gl::GLShareGroup),
mailbox_manager_(gles2::MailboxManager::Create(gpu_preferences)),
gpu_memory_manager_(this),
sync_point_manager_(sync_point_manager),
@@ -84,8 +84,8 @@ GpuChannelManager::~GpuChannelManager() {
gles2::ProgramCache* GpuChannelManager::program_cache() {
if (!program_cache_.get() &&
- (gfx::g_driver_gl.ext.b_GL_ARB_get_program_binary ||
- gfx::g_driver_gl.ext.b_GL_OES_get_program_binary) &&
+ (gl::g_driver_gl.ext.b_GL_ARB_get_program_binary ||
+ gl::g_driver_gl.ext.b_GL_OES_get_program_binary) &&
!gpu_preferences_.disable_gpu_program_cache) {
program_cache_.reset(new gles2::MemoryProgramCache(
gpu_preferences_.gpu_program_cache_size,
@@ -232,7 +232,7 @@ void GpuChannelManager::DestroyAllChannels() {
gpu_channels_.clear();
}
-gfx::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
+gl::GLSurface* GpuChannelManager::GetDefaultOffscreenSurface() {
if (!default_offscreen_surface_.get()) {
default_offscreen_surface_ =
gl::init::CreateOffscreenGLSurface(gfx::Size());
« no previous file with comments | « gpu/ipc/service/gpu_channel_manager.h ('k') | gpu/ipc/service/gpu_channel_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698