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

Issue 1269503007: Unify graphics buffer format & usage enums for GpuMemoryBuffer & SurfaceFactoryOzone (Closed)

Created:
5 years, 4 months ago by spang
Modified:
5 years, 4 months ago
CC:
Aaron Boodman, abarth-chromium, ben+mojo_chromium.org, cc-bugs_chromium.org, chromium-reviews, creis+watch_chromium.org, danakj+watch_chromium.org, darin (slow to review), darin-cc_chromium.org, feature-media-reviews_chromium.org, jam, jbauman+watch_chromium.org, kalyank, mcasas+watch_chromium.org, miu+watch_chromium.org, mkwst+moarreviews-renderer_chromium.org, mlamouri+watch-content_chromium.org, nasko+codewatch_chromium.org, ozone-reviews_chromium.org, penghuang+watch-mandoline_chromium.org, piman+watch_chromium.org, posciak+watch_chromium.org, qsr+mojo_chromium.org, sadrul, sievers+watch_chromium.org, viettrungluu+watch_chromium.org, Ian Vollick, wjia+watch_chromium.org, yzshen+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Unify graphics buffer enums for GpuMemoryBuffer & SurfaceFactoryOzone This moves the gfx::GpuMemoryBuffer::BufferFormat to gfx::BufferFormat and moves gfx::GpuMemoryBuffer:BufferUsage to gfx::BufferUsage, and removes the ozone versions in favor of a common type. This avoids unnecessary conversions. There should be no functional change. BUG=none TEST=compile & run for CrOS, compile for all other platforms CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel TBR=jam (API change) Committed: https://crrev.com/fcf5fab44b781da53a711476c4d48950ecf764b3 Cr-Commit-Position: refs/heads/master@{#341758}

Patch Set 1 #

Patch Set 2 : fix duplicate enum traits & mojo issue #

Patch Set 3 : fix mac LOG(ERROR) #

Patch Set 4 : fix our IPC_MESSAGE_EXPORT affecting printing_messages.h #

Total comments: 6

Patch Set 5 : one last case noticed by dshwang #

Patch Set 6 : constrain includes #

Total comments: 2

Patch Set 7 : add header to BUILD.gn #

Unified diffs Side-by-side diffs Delta from patch set Stats (+889 lines, -927 lines) Patch
M cc/resources/resource_provider.cc View 3 chunks +8 lines, -8 lines 0 comments Download
M cc/test/test_gpu_memory_buffer_manager.h View 1 chunk +2 lines, -2 lines 0 comments Download
M cc/test/test_gpu_memory_buffer_manager.cc View 6 chunks +43 lines, -48 lines 0 comments Download
M cc/test/test_image_factory.h View 1 chunk +1 line, -1 line 0 comments Download
M cc/test/test_image_factory.cc View 1 chunk +1 line, -1 line 0 comments Download
M components/view_manager/gles2/command_buffer_driver.cc View 1 chunk +1 line, -2 lines 0 comments Download
M components/view_manager/gles2/mojo_gpu_memory_buffer.h View 3 chunks +5 lines, -6 lines 0 comments Download
M components/view_manager/gles2/mojo_gpu_memory_buffer.cc View 4 chunks +42 lines, -47 lines 0 comments Download
M components/view_manager/gles2/mojo_gpu_memory_buffer_manager.h View 1 chunk +2 lines, -2 lines 0 comments Download
M components/view_manager/gles2/mojo_gpu_memory_buffer_manager.cc View 1 chunk +3 lines, -4 lines 0 comments Download
M content/browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc View 2 chunks +6 lines, -13 lines 0 comments Download
M content/browser/compositor/buffer_queue_unittest.cc View 2 chunks +4 lines, -2 lines 0 comments Download
M content/browser/compositor/gpu_process_transport_factory.h View 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/compositor/gpu_process_transport_factory.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/gpu/browser_gpu_memory_buffer_manager.h View 5 chunks +19 lines, -20 lines 0 comments Download
M content/browser/gpu/browser_gpu_memory_buffer_manager.cc View 11 chunks +33 lines, -35 lines 0 comments Download
M content/browser/gpu/gpu_process_host.h View 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/gpu/gpu_process_host.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_buffer_pool.cc View 1 chunk +1 line, -3 lines 0 comments Download
M content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc View 2 chunks +5 lines, -3 lines 0 comments Download
M content/browser/renderer_host/render_message_filter.h View 1 chunk +2 lines, -2 lines 0 comments Download
M content/browser/renderer_host/render_message_filter.cc View 1 chunk +5 lines, -6 lines 0 comments Download
M content/browser/renderer_host/render_process_host_impl.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M content/child/child_gpu_memory_buffer_manager.h View 1 chunk +2 lines, -2 lines 0 comments Download
M content/child/child_gpu_memory_buffer_manager.cc View 1 chunk +3 lines, -4 lines 0 comments Download
M content/child/child_thread_impl_browsertest.cc View 3 chunks +8 lines, -8 lines 0 comments Download
M content/common/child_process_host_impl.h View 1 chunk +2 lines, -2 lines 0 comments Download
M content/common/child_process_host_impl.cc View 1 2 3 4 1 chunk +2 lines, -2 lines 0 comments Download
M content/common/child_process_messages.h View 1 2 3 3 chunks +3 lines, -8 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl.h View 3 chunks +10 lines, -9 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl.cc View 7 chunks +43 lines, -43 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h View 2 chunks +3 lines, -3 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc View 3 chunks +8 lines, -9 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.h View 2 chunks +3 lines, -3 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_ozone_native_pixmap.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.h View 2 chunks +8 lines, -7 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_shared_memory.cc View 7 chunks +33 lines, -32 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h View 2 chunks +2 lines, -2 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc View 3 chunks +15 lines, -16 lines 0 comments Download
M content/common/gpu/client/gpu_memory_buffer_impl_unittest.cc View 3 chunks +6 lines, -7 lines 0 comments Download
M content/common/gpu/gpu_channel.h View 1 chunk +1 line, -1 line 0 comments Download
M content/common/gpu/gpu_channel.cc View 1 chunk +1 line, -1 line 0 comments Download
M content/common/gpu/gpu_command_buffer_stub.h View 1 chunk +1 line, -1 line 0 comments Download
M content/common/gpu/gpu_command_buffer_stub.cc View 1 chunk +1 line, -1 line 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory.h View 2 chunks +4 lines, -4 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_io_surface.h View 3 chunks +5 lines, -6 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_io_surface.cc View 6 chunks +34 lines, -34 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.h View 3 chunks +5 lines, -6 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_ozone_native_pixmap.cc View 5 chunks +11 lines, -50 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_shared_memory.h View 3 chunks +5 lines, -6 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_shared_memory.cc View 4 chunks +15 lines, -15 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_surface_texture.h View 3 chunks +5 lines, -6 lines 0 comments Download
M content/common/gpu/gpu_memory_buffer_factory_surface_texture.cc View 4 chunks +6 lines, -7 lines 0 comments Download
M content/common/gpu/gpu_messages.h View 1 3 chunks +4 lines, -3 lines 0 comments Download
M content/common/gpu/media/vaapi_drm_picture.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M content/renderer/media/renderer_gpu_video_accelerator_factories.h View 1 chunk +2 lines, -2 lines 0 comments Download
M content/renderer/media/renderer_gpu_video_accelerator_factories.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M gpu/command_buffer/client/gpu_memory_buffer_manager.h View 1 chunk +2 lines, -2 lines 0 comments Download
M gpu/command_buffer/service/image_factory.h View 2 chunks +6 lines, -7 lines 0 comments Download
M gpu/command_buffer/service/image_factory.cc View 2 chunks +41 lines, -41 lines 0 comments Download
M gpu/command_buffer/service/in_process_command_buffer.h View 1 chunk +1 line, -1 line 0 comments Download
M gpu/command_buffer/service/in_process_command_buffer.cc View 1 chunk +1 line, -1 line 0 comments Download
M gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc View 7 chunks +30 lines, -31 lines 0 comments Download
M gpu/command_buffer/tests/gl_manager.h View 1 chunk +1 line, -1 line 0 comments Download
M gpu/command_buffer/tests/gl_manager.cc View 8 chunks +42 lines, -46 lines 0 comments Download
M mandoline/ui/aura/surface_context_factory.h View 1 chunk +2 lines, -2 lines 0 comments Download
M mandoline/ui/aura/surface_context_factory.cc View 1 chunk +2 lines, -3 lines 0 comments Download
M media/renderers/gpu_video_accelerator_factories.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/renderers/mock_gpu_video_accelerator_factories.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/renderers/mock_gpu_video_accelerator_factories.cc View 2 chunks +6 lines, -4 lines 0 comments Download
M media/video/gpu_memory_buffer_video_frame_pool.cc View 1 chunk +1 line, -1 line 0 comments Download
M mojo/gles2/command_buffer_client_impl.cc View 1 1 chunk +3 lines, -6 lines 0 comments Download
M ui/compositor/compositor.h View 1 chunk +2 lines, -2 lines 0 comments Download
M ui/compositor/compositor.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M ui/compositor/test/in_process_context_factory.h View 1 chunk +2 lines, -2 lines 0 comments Download
M ui/compositor/test/in_process_context_factory.cc View 1 2 3 4 1 chunk +2 lines, -3 lines 0 comments Download
A ui/gfx/buffer_types.h View 1 1 chunk +37 lines, -0 lines 0 comments Download
M ui/gfx/gpu_memory_buffer.h View 3 chunks +2 lines, -26 lines 0 comments Download
M ui/gfx/ipc/BUILD.gn View 1 2 3 4 5 6 1 chunk +1 line, -0 lines 0 comments Download
M ui/gfx/ipc/gfx_ipc.gyp View 1 1 chunk +1 line, -0 lines 0 comments Download
M ui/gfx/ipc/gfx_param_traits.h View 1 1 chunk +3 lines, -1 line 0 comments Download
M ui/gfx/ipc/gfx_param_traits.cc View 1 1 chunk +20 lines, -0 lines 0 comments Download
A ui/gfx/ipc/gfx_param_traits_macros.h View 1 2 3 1 chunk +25 lines, -0 lines 0 comments Download
M ui/gl/gl_image_io_surface.h View 2 chunks +2 lines, -2 lines 0 comments Download
M ui/gl/gl_image_io_surface.mm View 1 2 7 chunks +51 lines, -52 lines 0 comments Download
M ui/gl/gl_image_memory.h View 2 chunks +3 lines, -4 lines 0 comments Download
M ui/gl/gl_image_memory.cc View 8 chunks +65 lines, -66 lines 0 comments Download
M ui/gl/gl_image_ozone_native_pixmap.h View 1 chunk +1 line, -1 line 0 comments Download
M ui/gl/gl_image_ozone_native_pixmap.cc View 4 chunks +26 lines, -26 lines 0 comments Download
M ui/gl/gl_image_ref_counted_memory.h View 1 chunk +1 line, -1 line 0 comments Download
M ui/gl/gl_image_ref_counted_memory.cc View 1 chunk +1 line, -1 line 0 comments Download
M ui/gl/gl_image_shared_memory.h View 1 chunk +1 line, -1 line 0 comments Download
M ui/gl/gl_image_shared_memory.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M ui/gl/gl_surface_ozone.cc View 1 chunk +3 lines, -4 lines 0 comments Download
M ui/ozone/common/gpu/ozone_gpu_message_params.h View 1 2 3 4 5 2 chunks +2 lines, -2 lines 0 comments Download
M ui/ozone/common/gpu/ozone_gpu_messages.h View 1 2 chunks +1 line, -3 lines 0 comments Download
M ui/ozone/demo/surfaceless_gl_renderer.cc View 1 chunk +3 lines, -3 lines 0 comments Download
M ui/ozone/platform/cast/surface_factory_cast.h View 1 chunk +5 lines, -4 lines 0 comments Download
M ui/ozone/platform/cast/surface_factory_cast.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M ui/ozone/platform/drm/gpu/gbm_buffer.h View 1 2 3 4 5 6 2 chunks +3 lines, -3 lines 0 comments Download
M ui/ozone/platform/drm/gpu/gbm_buffer.cc View 2 chunks +6 lines, -6 lines 0 comments Download
M ui/ozone/platform/drm/gpu/gbm_surface_factory.h View 1 chunk +3 lines, -3 lines 0 comments Download
M ui/ozone/platform/drm/gpu/gbm_surface_factory.cc View 1 2 3 4 2 chunks +6 lines, -6 lines 0 comments Download
M ui/ozone/platform/drm/ozone_platform_gbm.cc View 1 chunk +2 lines, -2 lines 0 comments Download
M ui/ozone/public/overlay_candidates_ozone.h View 1 chunk +1 line, -1 line 0 comments Download
M ui/ozone/public/surface_factory_ozone.h View 4 chunks +4 lines, -19 lines 0 comments Download
M ui/ozone/public/surface_factory_ozone.cc View 2 chunks +3 lines, -3 lines 0 comments Download

Messages

Total messages: 25 (9 generated)
spang
WDYT about sharing these enums?
5 years, 4 months ago (2015-07-31 06:40:15 UTC) #2
reveman
good idea, lgtm
5 years, 4 months ago (2015-07-31 16:36:23 UTC) #3
spang
danakj: please review ui/gfx kenrb: please review ui/gfx/ipc everything else: TBR
5 years, 4 months ago (2015-07-31 16:39:19 UTC) #5
dshwang
lgtm with nits https://codereview.chromium.org/1269503007/diff/60001/ui/ozone/common/gpu/ozone_gpu_message_params.h File ui/ozone/common/gpu/ozone_gpu_message_params.h (right): https://codereview.chromium.org/1269503007/diff/60001/ui/ozone/common/gpu/ozone_gpu_message_params.h#newcode17 ui/ozone/common/gpu/ozone_gpu_message_params.h:17: #include "ui/ozone/public/surface_factory_ozone.h" replace this header with ...
5 years, 4 months ago (2015-08-03 12:21:35 UTC) #7
dshwang
https://codereview.chromium.org/1269503007/diff/60001/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc File ui/ozone/platform/drm/gpu/gbm_surface_factory.cc (right): https://codereview.chromium.org/1269503007/diff/60001/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc#newcode115 ui/ozone/platform/drm/gpu/gbm_surface_factory.cc:115: if (usage != SCANOUT) s/SCANOUT/gfx::BufferUsage::SCANOUT/
5 years, 4 months ago (2015-08-03 12:37:54 UTC) #8
spang
https://codereview.chromium.org/1269503007/diff/60001/ui/ozone/common/gpu/ozone_gpu_message_params.h File ui/ozone/common/gpu/ozone_gpu_message_params.h (right): https://codereview.chromium.org/1269503007/diff/60001/ui/ozone/common/gpu/ozone_gpu_message_params.h#newcode17 ui/ozone/common/gpu/ozone_gpu_message_params.h:17: #include "ui/ozone/public/surface_factory_ozone.h" On 2015/08/03 12:21:35, dshwang wrote: > replace ...
5 years, 4 months ago (2015-08-04 15:36:51 UTC) #9
kenrb
This looks ok to me but tsepez is the sole OWNER of ui/gfx/ipc/gfx_param_traits.cc so I ...
5 years, 4 months ago (2015-08-04 15:39:08 UTC) #11
Tom Sepez
The messages themselves are fine, but do a build: export GYP_DEFINES="enable_ipc_fuzzer=1" gclient runhooks ninja -C ...
5 years, 4 months ago (2015-08-04 16:20:11 UTC) #12
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1269503007/100001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1269503007/100001
5 years, 4 months ago (2015-08-04 17:11:30 UTC) #14
spang
On 2015/08/04 16:20:11, Tom Sepez wrote: > The messages themselves are fine, but do a ...
5 years, 4 months ago (2015-08-04 17:15:51 UTC) #15
sadrul
ui lgtm https://codereview.chromium.org/1269503007/diff/100001/ui/gfx/ipc/gfx_ipc.gyp File ui/gfx/ipc/gfx_ipc.gyp (right): https://codereview.chromium.org/1269503007/diff/100001/ui/gfx/ipc/gfx_ipc.gyp#newcode29 ui/gfx/ipc/gfx_ipc.gyp:29: 'gfx_param_traits_macros.h', You need to update BUILD.gn too?
5 years, 4 months ago (2015-08-04 17:28:38 UTC) #17
spang
https://codereview.chromium.org/1269503007/diff/100001/ui/gfx/ipc/gfx_ipc.gyp File ui/gfx/ipc/gfx_ipc.gyp (right): https://codereview.chromium.org/1269503007/diff/100001/ui/gfx/ipc/gfx_ipc.gyp#newcode29 ui/gfx/ipc/gfx_ipc.gyp:29: 'gfx_param_traits_macros.h', On 2015/08/04 17:28:38, sadrul wrote: > You need ...
5 years, 4 months ago (2015-08-04 17:32:40 UTC) #18
spang
TBR jam for API changes across the repo
5 years, 4 months ago (2015-08-04 17:34:28 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1269503007/120001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1269503007/120001
5 years, 4 months ago (2015-08-04 17:35:41 UTC) #23
commit-bot: I haz the power
Committed patchset #7 (id:120001)
5 years, 4 months ago (2015-08-04 19:25:49 UTC) #24
commit-bot: I haz the power
5 years, 4 months ago (2015-08-04 19:26:18 UTC) #25
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/fcf5fab44b781da53a711476c4d48950ecf764b3
Cr-Commit-Position: refs/heads/master@{#341758}

Powered by Google App Engine
This is Rietveld 408576698