ui/gl/gl_image_ozone_native_pixmap.cc - Issue 2039813002: Add format modifier IDs for EGL_EXT_image_dma_buf_import extension

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_image_ozone_native_pixmap.cc

Issue 2039813002: Add format modifier IDs for EGL_EXT_image_dma_buf_import extension (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add format modifier IDs for EGL_EXT_image_dma_buf_import extension Created 4 years, 6 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

« ui/gfx/native_pixmap_handle_ozone.cc ('K') | « ui/gfx/native_pixmap_handle_ozone.cc ('k') | ui/ozone/platform/drm/client_native_pixmap_factory_gbm.cc » ('j') | ui/ozone/platform/drm/gpu/drm_thread.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/gl/gl_image_ozone_native_pixmap.cc

diff --git a/ui/gl/gl_image_ozone_native_pixmap.cc b/ui/gl/gl_image_ozone_native_pixmap.cc

index 977f02e424ff06f389098e1a4094bc4dfa6da31a..b4862c14d77946076560bcfdd28e255d527e7ef0 100644

--- a/ui/gl/gl_image_ozone_native_pixmap.cc

+++ b/ui/gl/gl_image_ozone_native_pixmap.cc

@@ -140,6 +140,7 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,

for (size_t plane = 0;

plane < gfx::NumberOfPlanesForBufferFormat(pixmap->GetBufferFormat());

++plane) {

+ uint64_t modifier = pixmap->GetDmaBufModifier(plane);

attrs.push_back(EGL_DMA_BUF_PLANE0_FD_EXT + plane * 3);

attrs.push_back(

pixmap->GetDmaBufFd(plane < pixmap->GetDmaBufFdCount() ? plane : 0));

@@ -147,6 +148,10 @@ bool GLImageOzoneNativePixmap::Initialize(ui::NativePixmap* pixmap,

attrs.push_back(pixmap->GetDmaBufOffset(plane));

attrs.push_back(EGL_DMA_BUF_PLANE0_PITCH_EXT + plane * 3);

attrs.push_back(pixmap->GetDmaBufPitch(plane));

+ attrs.push_back(EGL_LINUX_DRM_PLANE0_MODIFIER0_EXT + plane * 3);

+ attrs.push_back(modifier & 0xffffffff);

+ attrs.push_back(EGL_LINUX_DRM_PLANE0_MODIFIER1_EXT + plane * 3);

+ attrs.push_back(static_cast<uint32_t>((modifier >> 32) & 0xffffffff));

Daniele Castagna 2016/06/15 03:50:20 Is the & 0xffffffff really needed after shifting?

vinceh 2016/06/15 04:35:18 Will remove & 0xffffffff and keep the cast.

}

attrs.push_back(EGL_NONE);