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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_image_io_surface.mm

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/gl_image_glx.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_image_io_surface.mm
diff --git a/ui/gl/gl_image_io_surface.mm b/ui/gl/gl_image_io_surface.mm
index 8feca466e9317e999694d2cff51099be16cdc083..40ff5c39735bfc2d57452120ac3be01a5e8b04d1 100644
--- a/ui/gl/gl_image_io_surface.mm
+++ b/ui/gl/gl_image_io_surface.mm
@@ -42,24 +42,24 @@ bool ValidInternalFormat(unsigned internalformat) {
}
}
-bool ValidFormat(BufferFormat format) {
+bool ValidFormat(gfx::BufferFormat format) {
switch (format) {
- case BufferFormat::R_8:
- case BufferFormat::BGRA_8888:
- case BufferFormat::BGRX_8888:
- case BufferFormat::RGBA_8888:
- case BufferFormat::UYVY_422:
- case BufferFormat::YUV_420_BIPLANAR:
+ case gfx::BufferFormat::R_8:
+ case gfx::BufferFormat::BGRA_8888:
+ case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::RGBA_8888:
+ case gfx::BufferFormat::UYVY_422:
+ case gfx::BufferFormat::YUV_420_BIPLANAR:
return true;
- case BufferFormat::ATC:
- case BufferFormat::ATCIA:
- case BufferFormat::DXT1:
- case BufferFormat::DXT5:
- case BufferFormat::ETC1:
- case BufferFormat::BGR_565:
- case BufferFormat::RGBA_4444:
- case BufferFormat::RGBX_8888:
- case BufferFormat::YUV_420:
+ case gfx::BufferFormat::ATC:
+ case gfx::BufferFormat::ATCIA:
+ case gfx::BufferFormat::DXT1:
+ case gfx::BufferFormat::DXT5:
+ case gfx::BufferFormat::ETC1:
+ case gfx::BufferFormat::BGR_565:
+ case gfx::BufferFormat::RGBA_4444:
+ case gfx::BufferFormat::RGBX_8888:
+ case gfx::BufferFormat::YUV_420:
return false;
}
@@ -67,27 +67,27 @@ bool ValidFormat(BufferFormat format) {
return false;
}
-GLenum TextureFormat(BufferFormat format) {
+GLenum TextureFormat(gfx::BufferFormat format) {
switch (format) {
- case BufferFormat::R_8:
+ case gfx::BufferFormat::R_8:
return GL_RED;
- case BufferFormat::BGRA_8888:
- case BufferFormat::BGRX_8888:
- case BufferFormat::RGBA_8888:
+ case gfx::BufferFormat::BGRA_8888:
+ case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::RGBA_8888:
return GL_RGBA;
- case BufferFormat::UYVY_422:
+ case gfx::BufferFormat::UYVY_422:
return GL_RGB;
- case BufferFormat::YUV_420_BIPLANAR:
+ case gfx::BufferFormat::YUV_420_BIPLANAR:
return GL_RGB_YCBCR_420V_CHROMIUM;
- case BufferFormat::ATC:
- case BufferFormat::ATCIA:
- case BufferFormat::DXT1:
- case BufferFormat::DXT5:
- case BufferFormat::ETC1:
- case BufferFormat::BGR_565:
- case BufferFormat::RGBA_4444:
- case BufferFormat::RGBX_8888:
- case BufferFormat::YUV_420:
+ case gfx::BufferFormat::ATC:
+ case gfx::BufferFormat::ATCIA:
+ case gfx::BufferFormat::DXT1:
+ case gfx::BufferFormat::DXT5:
+ case gfx::BufferFormat::ETC1:
+ case gfx::BufferFormat::BGR_565:
+ case gfx::BufferFormat::RGBA_4444:
+ case gfx::BufferFormat::RGBX_8888:
+ case gfx::BufferFormat::YUV_420:
NOTREACHED();
return 0;
}
@@ -96,26 +96,26 @@ GLenum TextureFormat(BufferFormat format) {
return 0;
}
-GLenum DataFormat(BufferFormat format) {
+GLenum DataFormat(gfx::BufferFormat format) {
switch (format) {
- case BufferFormat::R_8:
+ case gfx::BufferFormat::R_8:
return GL_RED;
- case BufferFormat::BGRA_8888:
- case BufferFormat::BGRX_8888:
- case BufferFormat::RGBA_8888:
+ case gfx::BufferFormat::BGRA_8888:
+ case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::RGBA_8888:
return GL_BGRA;
- case BufferFormat::UYVY_422:
+ case gfx::BufferFormat::UYVY_422:
return GL_YCBCR_422_APPLE;
- case BufferFormat::ATC:
- case BufferFormat::ATCIA:
- case BufferFormat::DXT1:
- case BufferFormat::DXT5:
- case BufferFormat::ETC1:
- case BufferFormat::BGR_565:
- case BufferFormat::RGBA_4444:
- case BufferFormat::RGBX_8888:
- case BufferFormat::YUV_420:
- case BufferFormat::YUV_420_BIPLANAR:
+ case gfx::BufferFormat::ATC:
+ case gfx::BufferFormat::ATCIA:
+ case gfx::BufferFormat::DXT1:
+ case gfx::BufferFormat::DXT5:
+ case gfx::BufferFormat::ETC1:
+ case gfx::BufferFormat::BGR_565:
+ case gfx::BufferFormat::RGBA_4444:
+ case gfx::BufferFormat::RGBX_8888:
+ case gfx::BufferFormat::YUV_420:
+ case gfx::BufferFormat::YUV_420_BIPLANAR:
NOTREACHED();
return 0;
}
@@ -124,27 +124,27 @@ GLenum DataFormat(BufferFormat format) {
return 0;
}
-GLenum DataType(BufferFormat format) {
+GLenum DataType(gfx::BufferFormat format) {
switch (format) {
- case BufferFormat::R_8:
+ case gfx::BufferFormat::R_8:
return GL_UNSIGNED_BYTE;
- case BufferFormat::BGRA_8888:
- case BufferFormat::BGRX_8888:
- case BufferFormat::RGBA_8888:
+ case gfx::BufferFormat::BGRA_8888:
+ case gfx::BufferFormat::BGRX_8888:
+ case gfx::BufferFormat::RGBA_8888:
return GL_UNSIGNED_INT_8_8_8_8_REV;
- case BufferFormat::UYVY_422:
+ case gfx::BufferFormat::UYVY_422:
return GL_UNSIGNED_SHORT_8_8_APPLE;
break;
- case BufferFormat::ATC:
- case BufferFormat::ATCIA:
- case BufferFormat::DXT1:
- case BufferFormat::DXT5:
- case BufferFormat::ETC1:
- case BufferFormat::BGR_565:
- case BufferFormat::RGBA_4444:
- case BufferFormat::RGBX_8888:
- case BufferFormat::YUV_420:
- case BufferFormat::YUV_420_BIPLANAR:
+ case gfx::BufferFormat::ATC:
+ case gfx::BufferFormat::ATCIA:
+ case gfx::BufferFormat::DXT1:
+ case gfx::BufferFormat::DXT5:
+ case gfx::BufferFormat::ETC1:
+ case gfx::BufferFormat::BGR_565:
+ case gfx::BufferFormat::RGBA_4444:
+ case gfx::BufferFormat::RGBX_8888:
+ case gfx::BufferFormat::YUV_420:
+ case gfx::BufferFormat::YUV_420_BIPLANAR:
NOTREACHED();
return 0;
}
@@ -169,7 +169,7 @@ GLImageIOSurface::GLImageIOSurface(const gfx::Size& size,
: size_(size),
internalformat_(ConvertRequestedInternalFormat(internalformat)),
client_internalformat_(internalformat),
- format_(BufferFormat::RGBA_8888) {}
+ format_(gfx::BufferFormat::RGBA_8888) {}
GLImageIOSurface::~GLImageIOSurface() {
DCHECK(thread_checker_.CalledOnValidThread());
@@ -178,7 +178,7 @@ GLImageIOSurface::~GLImageIOSurface() {
bool GLImageIOSurface::Initialize(IOSurfaceRef io_surface,
gfx::GenericSharedMemoryId io_surface_id,
- BufferFormat format) {
+ gfx::BufferFormat format) {
DCHECK(thread_checker_.CalledOnValidThread());
DCHECK(!io_surface_);
@@ -201,7 +201,7 @@ bool GLImageIOSurface::Initialize(IOSurfaceRef io_surface,
bool GLImageIOSurface::InitializeWithCVPixelBuffer(
CVPixelBufferRef cv_pixel_buffer,
gfx::GenericSharedMemoryId io_surface_id,
- BufferFormat format) {
+ gfx::BufferFormat format) {
IOSurfaceRef io_surface = CVPixelBufferGetIOSurface(cv_pixel_buffer);
if (!io_surface) {
LOG(ERROR) << "Can't init GLImage from CVPixelBuffer with no IOSurface";
@@ -235,7 +235,7 @@ bool GLImageIOSurface::BindTexImage(unsigned target) {
// YUV_420_BIPLANAR is not supported by BindTexImage.
// CopyTexImage is supported by this format as that performs conversion to RGB
// as part of the copy operation.
- if (format_ == BufferFormat::YUV_420_BIPLANAR)
+ if (format_ == gfx::BufferFormat::YUV_420_BIPLANAR)
return false;
if (target != GL_TEXTURE_RECTANGLE_ARB) {
@@ -246,7 +246,7 @@ bool GLImageIOSurface::BindTexImage(unsigned target) {
}
CGLContextObj cgl_context =
- static_cast<CGLContextObj>(gfx::GLContext::GetCurrent()->GetHandle());
+ static_cast<CGLContextObj>(gl::GLContext::GetCurrent()->GetHandle());
DCHECK(io_surface_);
CGLError cgl_error =
@@ -265,7 +265,7 @@ bool GLImageIOSurface::BindTexImage(unsigned target) {
bool GLImageIOSurface::CopyTexImage(unsigned target) {
DCHECK(thread_checker_.CalledOnValidThread());
- if (format_ != BufferFormat::YUV_420_BIPLANAR)
+ if (format_ != gfx::BufferFormat::YUV_420_BIPLANAR)
return false;
if (target != GL_TEXTURE_RECTANGLE_ARB) {
@@ -273,14 +273,14 @@ bool GLImageIOSurface::CopyTexImage(unsigned target) {
return false;
}
- gfx::GLContext* gl_context = gfx::GLContext::GetCurrent();
+ gl::GLContext* gl_context = gl::GLContext::GetCurrent();
DCHECK(gl_context);
gl::YUVToRGBConverter* yuv_to_rgb_converter =
gl_context->GetYUVToRGBConverter();
DCHECK(yuv_to_rgb_converter);
- 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.
« no previous file with comments | « ui/gl/gl_image_glx.cc ('k') | ui/gl/gl_image_memory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698