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

Unified Diff: gpu/command_buffer/service/mailbox_manager_sync.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
Index: gpu/command_buffer/service/mailbox_manager_sync.cc
diff --git a/gpu/command_buffer/service/mailbox_manager_sync.cc b/gpu/command_buffer/service/mailbox_manager_sync.cc
index 8cf799232fa9dd52e0853f102108dbefaf53ec0b..5250882e0367dffac6bfff90b9c17683aed79e20 100644
--- a/gpu/command_buffer/service/mailbox_manager_sync.cc
+++ b/gpu/command_buffer/service/mailbox_manager_sync.cc
@@ -28,7 +28,7 @@ namespace {
base::LazyInstance<base::Lock> g_lock = LAZY_INSTANCE_INITIALIZER;
#if !defined(OS_MACOSX)
-typedef std::map<SyncToken, linked_ptr<gfx::GLFence>> SyncTokenToFenceMap;
+typedef std::map<SyncToken, linked_ptr<gl::GLFence>> SyncTokenToFenceMap;
base::LazyInstance<SyncTokenToFenceMap> g_sync_point_to_fence =
LAZY_INSTANCE_INITIALIZER;
base::LazyInstance<std::queue<SyncTokenToFenceMap::iterator>> g_sync_points =
@@ -38,7 +38,7 @@ base::LazyInstance<std::queue<SyncTokenToFenceMap::iterator>> g_sync_points =
void CreateFenceLocked(const SyncToken& sync_token) {
#if !defined(OS_MACOSX)
g_lock.Get().AssertAcquired();
- if (gfx::GetGLImplementation() == gfx::kGLImplementationMockGL)
+ if (gl::GetGLImplementation() == gl::kGLImplementationMockGL)
return;
std::queue<SyncTokenToFenceMap::iterator>& sync_points = g_sync_points.Get();
@@ -50,7 +50,7 @@ void CreateFenceLocked(const SyncToken& sync_token) {
sync_points.pop();
}
// Need to use EGL fences since we are likely not in a single share group.
- linked_ptr<gfx::GLFence> fence(make_linked_ptr(new gfx::GLFenceEGL));
+ linked_ptr<gl::GLFence> fence(make_linked_ptr(new gl::GLFenceEGL));
if (fence.get()) {
std::pair<SyncTokenToFenceMap::iterator, bool> result =
sync_point_to_fence.insert(std::make_pair(sync_token, fence));
« no previous file with comments | « gpu/command_buffer/service/in_process_command_buffer.cc ('k') | gpu/command_buffer/service/mailbox_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698