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

Unified Diff: media/gpu/v4l2_video_decode_accelerator.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 | « media/gpu/v4l2_slice_video_decode_accelerator.cc ('k') | media/gpu/vaapi_drm_picture.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/v4l2_video_decode_accelerator.cc
diff --git a/media/gpu/v4l2_video_decode_accelerator.cc b/media/gpu/v4l2_video_decode_accelerator.cc
index 410cd6ca536ad30038c3f43510b2c9455b852114..412c2fbc1dfedb95caac712e7c099f148f3546b7 100644
--- a/media/gpu/v4l2_video_decode_accelerator.cc
+++ b/media/gpu/v4l2_video_decode_accelerator.cc
@@ -246,7 +246,7 @@ bool V4L2VideoDecodeAccelerator::Initialize(const Config& config,
// TODO(posciak): crbug.com/450898.
#if defined(ARCH_CPU_ARMEL)
- if (!gfx::g_driver_egl.ext.b_EGL_KHR_fence_sync) {
+ if (!gl::g_driver_egl.ext.b_EGL_KHR_fence_sync) {
LOG(ERROR) << "Initialize(): context does not have EGL_KHR_fence_sync";
return false;
}
@@ -331,14 +331,14 @@ void V4L2VideoDecodeAccelerator::AssignPictureBuffers(
return;
}
- gfx::GLContext* gl_context = get_gl_context_cb_.Run();
+ gl::GLContext* gl_context = get_gl_context_cb_.Run();
if (!gl_context || !make_context_current_cb_.Run()) {
LOG(ERROR) << "AssignPictureBuffers(): could not make context current";
NOTIFY_ERROR(PLATFORM_FAILURE);
return;
}
- gfx::ScopedTextureBinder bind_restore(GL_TEXTURE_EXTERNAL_OES, 0);
+ gl::ScopedTextureBinder bind_restore(GL_TEXTURE_EXTERNAL_OES, 0);
// It's safe to manipulate all the buffer state here, because the decoder
// thread is waiting on pictures_assigned_.
« no previous file with comments | « media/gpu/v4l2_slice_video_decode_accelerator.cc ('k') | media/gpu/vaapi_drm_picture.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698