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

Unified Diff: content/common/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: content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
index 6185150e5cf71764ea4ffcef46548084ae8253e3..09d68a62236dae1495c35eb61faa6fb6bac4078d 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_ozone_native_buffer.cc
@@ -12,8 +12,11 @@ namespace content {
namespace {
const GpuMemoryBufferFactory::Configuration kSupportedConfigurations[] = {
- { gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT },
- { gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT }
+ {gfx::GpuMemoryBuffer::RGBA_8888, gfx::GpuMemoryBuffer::SCANOUT},
+ {gfx::GpuMemoryBuffer::RGBX_8888, gfx::GpuMemoryBuffer::SCANOUT},
+#if defined(USE_OZONE_GBM_INTEL)
+ {gfx::GpuMemoryBuffer::BGRA_8888, gfx::GpuMemoryBuffer::MAP}
+#endif
};
} // namespace
@@ -58,13 +61,13 @@ GpuMemoryBufferFactoryOzoneNativeBuffer::CreateGpuMemoryBuffer(
gfx::GpuMemoryBuffer::Usage usage,
int client_id,
gfx::PluginWindowHandle surface_handle) {
- if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer(
- id, size, format, usage, client_id, surface_handle)) {
- return gfx::GpuMemoryBufferHandle();
- }
gfx::GpuMemoryBufferHandle handle;
handle.type = gfx::OZONE_NATIVE_BUFFER;
handle.id = id;
+ if (!ozone_native_buffer_factory_.CreateGpuMemoryBuffer(
+ id, size, format, usage, client_id, surface_handle, &handle)) {
+ return gfx::GpuMemoryBufferHandle();
+ }
return handle;
}

Powered by Google App Engine
This is Rietveld 408576698