Use SwiftShader for all tests and remove OSMesa from the codebase once this is done.
To be sure, this work has been underway for a very long time and it's exciting to see it close to being completed! Blocking on related bugs.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/0f21886190d0c27515faec2ada23541b936fb0f3 commit 0f21886190d0c27515faec2ada23541b936fb0f3 Author: Alexis Hetu <sugoi@google.com> Date: Mon Aug 13 18:51:42 2018 Remove OSMesa from the chromium repo Now that SwiftShader has been integrated into every platform on every test, we can remove OSMesa from the chromium codebase. BUG= chromium:873321 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_chromium_dbg_ng;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.blink:linux_trusty_blink_rel Change-Id: Ie75c73c172aaffd17a3e041aa7f4cf37a96c3d4d Reviewed-on: https://chromium-review.googlesource.com/1128207 Reviewed-by: Devlin <rdevlin.cronin@chromium.org> Reviewed-by: Antoine Labour <piman@chromium.org> Reviewed-by: Mohsen Izadi <mohsen@chromium.org> Reviewed-by: Robert Kroeger <rjkroege@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Cait Phillips <caitkp@chromium.org> Reviewed-by: Robert Sesek <rsesek@chromium.org> Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org> Reviewed-by: Dale Curtis <dalecurtis@chromium.org> Reviewed-by: Bruce Dawson <brucedawson@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org> Commit-Queue: Alexis Hétu <sugoi@chromium.org> Cr-Commit-Position: refs/heads/master@{#582655} [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/DEPS [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ash/app_list/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/build/check_gn_headers_whitelist.txt [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/cc/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/chrome/test/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/chrome/test/base/chrome_unit_test_suite.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/chrome/test/base/interactive_ui_tests_main.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/components/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/components/viz/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/components/viz/common/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/content/common/sandbox_init_mac.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/content/shell/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/content/shell/android/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/content/test/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/content/test/layouttest_support.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/extensions/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/extensions/shell/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/gpu/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/gpu/command_buffer/service/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/gpu/command_buffer/service/feature_info.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/gpu/config/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/gpu/ipc/host/gpu_memory_buffer_support.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/gpu/ipc/service/image_transport_surface_mac.mm [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/media/gpu/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/media/gpu/ipc/service/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/services/ui/gpu_host/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/services/ui/ws2/BUILD.gn [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/third_party/mesa/BUILD.gn [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/third_party/mesa/chromium.patch [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/third_party/mesa/chromium/empty.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/third_party/mesa/generate_git_sha1.py [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/third_party/mesa/redirectoutput.py [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/BUILD.gn [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GL/gl.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GL/glext.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GL/glx.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GL/glxext.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GL/wglext.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GLES/egl.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GLES/gl.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GLES/glext.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/GLES/glplatform.h [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/LICENSE [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/OWNERS [add] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/third_party/mesa_headers/README.chromium [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/aura/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/base/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/compositor/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/compositor/test/test_suite.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/events/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/DEPS [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/generate_bindings.py [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_bindings.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_bindings.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_bindings_api_autogen_osmesa.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_bindings_autogen_osmesa.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_bindings_autogen_osmesa.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_context.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_context_osmesa.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_context_osmesa.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_enums_implementation_autogen.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_implementation.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_implementation.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_implementation_osmesa.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_implementation_osmesa.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_osmesa_api_implementation.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_osmesa_api_implementation.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_surface_osmesa.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_surface_osmesa.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_surface_osmesa_win.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_surface_osmesa_win.h [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_surface_osmesa_x11.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/gl/gl_surface_osmesa_x11.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_switches.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/gl_switches.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_factory_android.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_factory_mac.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_factory_win.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_factory_x11.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_initializer_android.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_initializer_mac.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_initializer_win.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/init/gl_initializer_x11.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/test/gl_surface_test_support.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/gl/test/gl_surface_test_support.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/message_center/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/common/BUILD.gn [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/ozone/common/gl_ozone_osmesa.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/ozone/common/gl_ozone_osmesa.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/gl/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/cast/surface_factory_cast.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/cast/surface_factory_cast.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/drm/gpu/gbm_surface_factory.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/drm/gpu/gbm_surface_factory.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/headless/BUILD.gn [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/ozone/platform/headless/gl_surface_osmesa_png.cc [delete] https://crrev.com/4fd605616630808e267fc789ea619a52a8cff257/ui/ozone/platform/headless/gl_surface_osmesa_png.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/headless/headless_surface_factory.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/headless/headless_surface_factory.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/wayland/wayland_surface_factory.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/wayland/wayland_surface_factory.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/x11/x11_surface_factory.cc [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/ozone/platform/x11/x11_surface_factory.h [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/touch_selection/BUILD.gn [modify] https://crrev.com/0f21886190d0c27515faec2ada23541b936fb0f3/ui/views/views_test_suite.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/86d8a53eb84f40018c35d064ec1b04908b5dde10 commit 86d8a53eb84f40018c35d064ec1b04908b5dde10 Author: Lei Zhang <thestig@chromium.org> Date: Wed Aug 15 18:10:21 2018 Remove third_party/mesa and references. third_party/mesa/src is no longer checked out as of r582655. BUG= 873321 Change-Id: I6ee0dabd58b77a2c1995b7d42df4fb4df909884c Reviewed-on: https://chromium-review.googlesource.com/1175403 Reviewed-by: Alexis Hétu <sugoi@chromium.org> Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Peter Collingbourne <pcc@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/master@{#583326} [modify] https://crrev.com/86d8a53eb84f40018c35d064ec1b04908b5dde10/build/linux/unbundle/README [delete] https://crrev.com/a2eb1878f5a1ba4ee02a1bc5838584ee38c257af/third_party/mesa/LICENSE [delete] https://crrev.com/a2eb1878f5a1ba4ee02a1bc5838584ee38c257af/third_party/mesa/OWNERS [delete] https://crrev.com/a2eb1878f5a1ba4ee02a1bc5838584ee38c257af/third_party/mesa/README.chromium [delete] https://crrev.com/a2eb1878f5a1ba4ee02a1bc5838584ee38c257af/third_party/mesa/README.txt [modify] https://crrev.com/86d8a53eb84f40018c35d064ec1b04908b5dde10/tools/cfi/blacklist.txt [modify] https://crrev.com/86d8a53eb84f40018c35d064ec1b04908b5dde10/tools/checklicenses/checklicenses.py [modify] https://crrev.com/86d8a53eb84f40018c35d064ec1b04908b5dde10/tools/checkperms/checkperms.py
Per https://chromium-review.googlesource.com/1173448 please also remove libosmesa.so references in chromeos repositories (package:^chromeos in internal codesearch)
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927 commit 3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927 Author: Alexis Hetu <sugoi@google.com> Date: Mon Aug 27 18:30:44 2018 Removing OSMesa specific workarounds Now that SwiftShader has replaced OSMesa, we can remove all OSMesa specific workarounds in chromium. Bug: chromium:873321 chromium:174845 chromium:348350 chromium:347967 Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel Change-Id: I12fe2de6f7ea963ca9ebeeee1f35cd54e4cbecd0 Reviewed-on: https://chromium-review.googlesource.com/1175450 Reviewed-by: Bruce Dawson <brucedawson@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Reviewed-by: Kenneth Russell <kbr@chromium.org> Reviewed-by: enne <enne@chromium.org> Reviewed-by: Michael Moss <mmoss@chromium.org> Reviewed-by: Bill Budge <bbudge@chromium.org> Commit-Queue: Alexis Hétu <sugoi@chromium.org> Cr-Commit-Position: refs/heads/master@{#586326} [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/chrome/tools/build/linux/FILES.cfg [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/chrome/tools/build/mac/FILES.cfg [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/chrome/tools/build/win/FILES.cfg [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/components/viz/service/display/gl_renderer_unittest.cc [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/components/viz/service/display/renderer_pixeltest.cc [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/components/viz/test/data/trilinear_filtering.png [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/docs/chromeos_build_instructions.md [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/command_buffer/service/context_group.cc [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/config/gpu_driver_bug_list.json [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/config/gpu_driver_bug_workarounds.cc [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/config/gpu_driver_bug_workarounds.h [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/config/gpu_workaround_list.txt [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/config/software_rendering_list.json [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/gpu/ipc/service/image_transport_surface.h [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/ppapi/native_client/tools/browser_tester/browsertester/browserlauncher.py [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/third_party/blink/tools/blinkpy/web_tests/breakpad/dump_reader_multipart.py [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/tools/determinism/deterministic_build_whitelist.pyl [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/tools/msan/blacklist.txt [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/ui/gl/gl_context.h [modify] https://crrev.com/3384f06d7fd5e0ebc07fabcf9f5b9a1d0996b927/ui/gl/gl_surface_format.h
OSMesa and OSMesa related workarounds have been removed from the Chromium codebase, so closing this issue.
Awesome work Alexis! This was a tremendous amount of work and you carried it through gracefully.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/878ac89189dddbf00301a91e50a6044d4519dbfa commit 878ac89189dddbf00301a91e50a6044d4519dbfa Author: Daniel Bratell <bratell@opera.com> Date: Tue Nov 13 18:08:31 2018 Remove references from .gn to third_party/mesa third_party/mesa is no longer part of Chromium, and having it listed here enforces gn checks for any product that still checks out mesa in third_party (i.e. Google Chrome) which is a problem. Bug: 873321 Change-Id: If1c28fb2c393f04c9b0fe0703204fd7225a1a483 Reviewed-on: https://chromium-review.googlesource.com/c/1333812 Commit-Queue: Scott Graham <scottmg@chromium.org> Reviewed-by: Scott Graham <scottmg@chromium.org> Cr-Commit-Position: refs/heads/master@{#607653} [modify] https://crrev.com/878ac89189dddbf00301a91e50a6044d4519dbfa/.gn
Comment 1 by kbr@chromium.org
, Aug 10Components: Internals>GPU>Internals
Labels: -Pri-3 OS-Android OS-Chrome OS-Fuchsia OS-iOS OS-Linux OS-Mac OS-Windows Pri-2