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

Unified Diff: ui/gl/yuv_to_rgb_converter.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 | « ui/gl/wgl_api_unittest.cc ('k') | ui/keyboard/test/run_all_unittests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/yuv_to_rgb_converter.cc
diff --git a/ui/gl/yuv_to_rgb_converter.cc b/ui/gl/yuv_to_rgb_converter.cc
index c414268a8cd93b9e934668531f62e7e5bee0e2ec..82ff21a99d6efc2e31b915c6c2f780788ba00333 100644
--- a/ui/gl/yuv_to_rgb_converter.cc
+++ b/ui/gl/yuv_to_rgb_converter.cc
@@ -72,27 +72,27 @@ STRINGIZE(
YUVToRGBConverter::YUVToRGBConverter() {
bool use_core_profile =
- gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGLCoreProfile;
- gfx::ScopedSetGLToRealGLApi scoped_set_gl_api;
+ gl::GetGLImplementation() == gl::kGLImplementationDesktopGLCoreProfile;
+ gl::ScopedSetGLToRealGLApi scoped_set_gl_api;
glGenFramebuffersEXT(1, &framebuffer_);
- vertex_buffer_ = gfx::GLHelper::SetupQuadVertexBuffer();
- vertex_shader_ = gfx::GLHelper::LoadShader(
+ vertex_buffer_ = gl::GLHelper::SetupQuadVertexBuffer();
+ vertex_shader_ = gl::GLHelper::LoadShader(
GL_VERTEX_SHADER,
base::StringPrintf("%s\n%s",
use_core_profile ? kVertexHeaderCoreProfile
: kVertexHeaderCompatiblityProfile,
kVertexShader)
.c_str());
- fragment_shader_ = gfx::GLHelper::LoadShader(
+ fragment_shader_ = gl::GLHelper::LoadShader(
GL_FRAGMENT_SHADER,
base::StringPrintf("%s\n%s",
use_core_profile ? kFragmentHeaderCoreProfile
: kFragmentHeaderCompatiblityProfile,
kFragmentShader)
.c_str());
- program_ = gfx::GLHelper::SetupProgram(vertex_shader_, fragment_shader_);
+ program_ = gl::GLHelper::SetupProgram(vertex_shader_, fragment_shader_);
- gfx::ScopedUseProgram use_program(program_);
+ gl::ScopedUseProgram use_program(program_);
size_location_ = glGetUniformLocation(program_, "a_texScale");
DCHECK_NE(-1, size_location_);
int y_sampler_location = glGetUniformLocation(program_, "a_y_texture");
@@ -108,7 +108,7 @@ YUVToRGBConverter::YUVToRGBConverter() {
}
YUVToRGBConverter::~YUVToRGBConverter() {
- gfx::ScopedSetGLToRealGLApi scoped_set_gl_api;
+ gl::ScopedSetGLToRealGLApi scoped_set_gl_api;
glDeleteTextures(1, &y_texture_);
glDeleteTextures(1, &uv_texture_);
glDeleteProgram(program_);
@@ -123,7 +123,7 @@ void YUVToRGBConverter::CopyYUV420ToRGB(unsigned target,
unsigned rgb_texture) {
// Only support for rectangle targets exists so far.
DCHECK_EQ(static_cast<GLenum>(GL_TEXTURE_RECTANGLE_ARB), target);
- gfx::ScopedSetGLToRealGLApi scoped_set_gl_api;
+ gl::ScopedSetGLToRealGLApi scoped_set_gl_api;
// Note that state restoration is done explicitly instead of scoped binders to
// avoid https://crbug.com/601729.
@@ -146,15 +146,15 @@ void YUVToRGBConverter::CopyYUV420ToRGB(unsigned target,
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, y_texture_);
glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_RECTANGLE_ARB, uv_texture_);
- gfx::ScopedFrameBufferBinder framebuffer_binder(framebuffer_);
- gfx::ScopedViewport viewport(0, 0, size.width(), size.height());
+ gl::ScopedFrameBufferBinder framebuffer_binder(framebuffer_);
+ gl::ScopedViewport viewport(0, 0, size.width(), size.height());
glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_RECTANGLE_ARB, rgb_texture, 0);
DCHECK_EQ(static_cast<GLenum>(GL_FRAMEBUFFER_COMPLETE),
glCheckFramebufferStatusEXT(GL_FRAMEBUFFER));
- gfx::ScopedUseProgram use_program(program_);
+ gl::ScopedUseProgram use_program(program_);
glUniform2f(size_location_, size.width(), size.height());
- gfx::GLHelper::DrawQuad(vertex_buffer_);
+ gl::GLHelper::DrawQuad(vertex_buffer_);
// Restore previous state.
glFramebufferTexture2DEXT(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
« no previous file with comments | « ui/gl/wgl_api_unittest.cc ('k') | ui/keyboard/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698