content/common/gpu/gpu_channel.cc - Issue 1417363006: ui: Add support for creating GLImage instances from shared memory pools.

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: content/common/gpu/gpu_channel.cc

Issue 1417363006: ui: Add support for creating GLImage instances from shared memory pools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usage-rename

Patch Set: static_cast<off_t> to make windows build happy Created 5 years, 2 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 | « content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc ('k') | gpu/command_buffer/service/in_process_command_buffer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/common/gpu/gpu_channel.cc

diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc

index 88d59ecf413a1a2ab73b536e0a6224b4e994576f..2ef4571f1cbd7a92a1957fc1f50aee7a2373e8db 100644

--- a/content/common/gpu/gpu_channel.cc

+++ b/content/common/gpu/gpu_channel.cc

@@ -1042,15 +1042,15 @@ scoped_refptr<gfx::GLImage> GpuChannel::CreateImageForGpuMemoryBuffer(

case gfx::SHARED_MEMORY_BUFFER: {

scoped_refptr<gfx::GLImageSharedMemory> image(

new gfx::GLImageSharedMemory(size, internalformat));

- if (!image->Initialize(handle.handle, handle.id, format))

- return scoped_refptr<gfx::GLImage>();

+ if (!image->Initialize(handle.handle, handle.id, format, handle.offset))

+ return nullptr;

return image;

}

default: {

GpuChannelManager* manager = gpu_channel_manager();

if (!manager->gpu_memory_buffer_factory())

- return scoped_refptr<gfx::GLImage>();

+ return nullptr;

return manager->gpu_memory_buffer_factory()

->AsImageFactory()