|
Revert of Move static GL binding initialization to //ui/gl/init. (patchset #7 id:120001 of https://codereview.chromium.org/2094513002/ )
Reason for revert:
Suspected of breaking Official "win trunk" builder:
c:\b\build\slave\win_trunk\build\src\ui\gl\init\gl_initializer_win.cc(32): fatal error C1083: Cannot open include file: 'software_renderer.h': No such file or directory
Please see crbug.com/623657 for details.
Original issue's description:
> Move static GL binding initialization to //ui/gl/init.
>
> Static GL binding initialization needs to call out to the Ozone
> platform. Move this initialization code from //ui/gl to //ui/gl/init as
> part of larger effort to break //ui/gl dep on //ui/ozone. Also move
> InitializationDebugGLBindings() and ClearGLBindings() in a similar
> fashion as they are closely linked to static initialization.
>
> Unfortunately, dynamic GL binding initialization can't be moved
> //ui/gl/init. It would be nice to have all the initialization code in
> one target but dynamic GL binding initialization is used by GLContext.
>
> The existing InitializationStaticGLBindings() functions had grown to be
> very large for some platforms. Where appropriate the code for each
> implementation has been extracted into it's own method to improve
> readability.
>
> The PRESUBMIT.py script is modified slightly here. The existing static
> GL initialization uses ScopedAllowIO on some platforms. This function is
> banned so moving the code triggers presubmit errors. The GPU main thread
> can't continue until initialization is finished anyways so moving
> blocking code to a different thread isn't helpful. Add new exemptions to
> PRESUBMIT.py.
>
> BUG= 611142
> CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_optional_gpu_tests_rel;tryserver.chromium.mac:mac_optional_gpu_tests_rel;tryserver.chromium.win:win_optional_gpu_tests_rel
>
> Committed: https://crrev.com/507532e60d484704354edd17a7b51904e7a97d88
> Cr-Commit-Position: refs/heads/master@{#402259}
TBR=piman@chromium.org,dpranke@chromium.org,kylechar@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG= 611142
Committed: https://crrev.com/f6fb94eabd50367cd9873ca6765fab04627f819b
Cr-Commit-Position: refs/heads/master@{#402287}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+797 lines, -808 lines) |
Patch |
|
M |
PRESUBMIT.py
|
View
|
|
1 chunk |
+2 lines, -5 lines |
0 comments
|
Download
|
|
M |
gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
gpu/command_buffer/service/gpu_service_test.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
gpu/config/gpu_info_collector_unittest.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
gpu/ipc/service/gpu_channel_unittest.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
ui/gl/angle_platform_impl.h
|
View
|
|
1 chunk |
+1 line, -3 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_egl_api_implementation.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_egl_api_implementation.cc
|
View
|
|
2 chunks |
+0 lines, -18 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_gl_api_implementation.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_glx_api_implementation.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation.h
|
View
|
|
5 chunks |
+13 lines, -6 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation_android.cc
|
View
|
|
3 chunks |
+94 lines, -4 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation_mac.cc
|
View
|
|
4 chunks |
+108 lines, -4 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation_osmesa.h
|
View
|
|
1 chunk |
+4 lines, -5 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation_ozone.cc
|
View
|
|
2 chunks |
+71 lines, -2 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation_win.cc
|
View
|
|
2 chunks |
+302 lines, -4 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_implementation_x11.cc
|
View
|
|
3 chunks |
+167 lines, -5 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_osmesa_api_implementation.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
ui/gl/gl_wgl_api_implementation.h
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
|
M |
ui/gl/gpu_timing_unittest.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_factory.h
|
View
|
|
2 chunks |
+8 lines, -11 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_factory.cc
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_initializer.h
|
View
|
|
1 chunk |
+1 line, -12 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_initializer_android.cc
|
View
|
|
2 chunks |
+1 line, -79 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_initializer_mac.cc
|
View
|
|
4 chunks |
+0 lines, -109 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_initializer_ozone.cc
|
View
|
|
2 chunks |
+1 line, -63 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_initializer_win.cc
|
View
|
|
2 chunks |
+1 line, -289 lines |
0 comments
|
Download
|
|
M |
ui/gl/init/gl_initializer_x11.cc
|
View
|
|
2 chunks |
+1 line, -154 lines |
0 comments
|
Download
|
|
M |
ui/gl/test/gl_image_test_support.cc
|
View
|
|
2 chunks |
+1 line, -2 lines |
0 comments
|
Download
|
|
M |
ui/gl/test/gl_surface_test_support.cc
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
Total messages: 8 (3 generated)
|