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

Unified Diff: ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc

Issue 1071273002: NotForReview: Implement zero/one-copy texture for ozone freon using Intel DRM Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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: ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
diff --git a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
index 9fdc293ea6ad68d8ef601b998a44898d69d18413..2507647b2fc55de189f56dd7ff1728752dd10f91 100644
--- a/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
+++ b/ui/ozone/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
@@ -86,8 +86,8 @@ class GLImageOzoneNativePixmapDmaBuf : public gfx::GLImageLinuxDMABuffer {
SurfaceFactoryOzone::BufferFormat GetOzoneFormatFor(
gfx::GpuMemoryBuffer::Format format) {
switch (format) {
- case gfx::GpuMemoryBuffer::RGBA_8888:
- return SurfaceFactoryOzone::RGBA_8888;
+ case gfx::GpuMemoryBuffer::BGRA_8888:
+ return SurfaceFactoryOzone::BGRA_8888;
case gfx::GpuMemoryBuffer::RGBX_8888:
return SurfaceFactoryOzone::RGBX_8888;
case gfx::GpuMemoryBuffer::ATC:
@@ -96,14 +96,14 @@ SurfaceFactoryOzone::BufferFormat GetOzoneFormatFor(
case gfx::GpuMemoryBuffer::DXT5:
case gfx::GpuMemoryBuffer::ETC1:
case gfx::GpuMemoryBuffer::R_8:
- case gfx::GpuMemoryBuffer::BGRA_8888:
+ case gfx::GpuMemoryBuffer::RGBA_8888:
case gfx::GpuMemoryBuffer::YUV_420:
NOTREACHED();
- return SurfaceFactoryOzone::RGBA_8888;
+ return SurfaceFactoryOzone::BGRA_8888;
}
NOTREACHED();
- return SurfaceFactoryOzone::RGBA_8888;
+ return SurfaceFactoryOzone::BGRA_8888;
}
SurfaceFactoryOzone::BufferUsage GetOzoneUsageFor(
@@ -139,11 +139,12 @@ bool GpuMemoryBufferFactoryOzoneNativeBuffer::CreateGpuMemoryBuffer(
gfx::GpuMemoryBuffer::Format format,
gfx::GpuMemoryBuffer::Usage usage,
int client_id,
- gfx::PluginWindowHandle surface_handle) {
+ gfx::PluginWindowHandle surface_handle,
+ gfx::GpuMemoryBufferHandle* new_handle) {
scoped_refptr<NativePixmap> pixmap =
SurfaceFactoryOzone::GetInstance()->CreateNativePixmap(
surface_handle, size, GetOzoneFormatFor(format),
- GetOzoneUsageFor(usage));
+ GetOzoneUsageFor(usage), new_handle);
if (!pixmap.get()) {
LOG(ERROR) << "Failed to create pixmap " << size.width() << "x"
<< size.height() << " format " << format << ", usage " << usage;

Powered by Google App Engine
This is Rietveld 408576698