Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Respect the custom GL proc table when creating the resource context on the IO thread. #7893

Merged
merged 3 commits into from
Feb 21, 2019

Conversation

chinmaygarde
Copy link
Member

@chinmaygarde
Copy link
Member Author

@jason-simmons Can we please verify this on your setup? I am only able to test this on FDE.

@chinmaygarde chinmaygarde merged commit 684c939 into flutter:master Feb 21, 2019
@chinmaygarde chinmaygarde deleted the proc_table branch February 21, 2019 01:23
cbracken added a commit to cbracken/flutter_engine that referenced this pull request Feb 21, 2019
…ontext on the IO thread. (flutter#7893)"

Breaks Windows build:
```
FAILED: obj/flutter/shell/gpu/gpu_surface_gl.gpu_surface_gl_delegate.obj
ninja -t msvc -e environment.x64 -- E:\b\c\goma_cache\client/gomacc.exe "E:\b\depot_tools\win_toolchain\vs_files\3bc0ec615cf20ee342f3bc29bc991b5ad66d8d2c\VC\Tools\MSVC\14.14.26428\bin\HostX64\x64/cl.exe" /nologo /showIncludes /FC @obj/flutter/shell/gpu/gpu_surface_gl.gpu_surface_gl_delegate.obj.rsp /c ../../flutter/shell/gpu/gpu_surface_gl_delegate.cc /Foobj/flutter/shell/gpu/gpu_surface_gl.gpu_surface_gl_delegate.obj /Fdobj/flutter/shell/gpu/gpu_surface_gl_cc.pdb
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(70): error C2059: syntax error: '.'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(71): error C2143: syntax error: missing ';' before '}'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(76): error C2061: syntax error: identifier 'ProcResolverContext'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(78): error C3536: 'proc_resolver_context': cannot be used before it is initialized
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(78): error C2227: left of '->resolver' must point to class/struct/union/generic type
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(78): note: type is 'int'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(82): error C2059: syntax error: 'if'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(82): error C2143: syntax error: missing ';' before '{'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(82): error C2447: '{': missing function header (old-style formal list?)
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(87): error C2059: syntax error: 'if'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(87): error C2143: syntax error: missing ';' before '{'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(87): error C2447: '{': missing function header (old-style formal list?)
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(91): error C2059: syntax error: '('
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(91): error C2059: syntax error: ')'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(92): error C2059: syntax error: 'return'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(95): error C2653: 'GPUSurfaceGLDelegate': is not a class or namespace name
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(95): error C2270: 'GetGLInterface': modifiers not allowed on nonmember functions
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(96): error C3861: 'GetGLProcResolver': identifier not found
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(96): error C3861: 'CreateGLInterface': identifier not found
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(100): error C2653: 'GPUSurfaceGLDelegate': is not a class or namespace name
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(101): error C3861: 'CreateGLInterface': identifier not found
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(104): error C2059: syntax error: '}'
e:\b\rr\tmpahx5uo\w\src\flutter\shell\gpu\gpu_surface_gl_delegate.cc(104): error C2143: syntax error: missing ';' before '}'
```

This reverts commit 684c939.
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 21, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 21, 2019
cbracken added a commit to cbracken/flutter that referenced this pull request Feb 21, 2019
flutter/engine@293b3de98 Roll src/third_party/skia 20ebd0cb3882..348227b89430 (4 commits) (flutter/engine#7900)
flutter/engine@6e6020d29 Eliminate .member = foo struct initialization (flutter/engine#7899)
flutter/engine@6d8bd99af Revert "Reland PerformanceOverlayLayer golden test (flutter/engine#7863)" (flutter#7895)
flutter/engine@39f7066b6 Test profile and release build and unit tests (flutter/engine#7880)
flutter/engine@abe9826a9 Add accessibility semantics support to embedder (flutter/engine#7891)
flutter/engine@ce7016e1f Roll src/third_party/skia e471c05f92e8..20ebd0cb3882 (4 commits) (flutter/engine#7894)
flutter/engine@684c9394c Respect the custom GL proc table when creating the resource context on the IO thread. (flutter/engine#7893)
flutter/engine@e11d0e96f Android embedding refactor pr5 add flutterengine impl (flutter/engine#7878)
flutter/engine@2f4a38dbd Android embedding refactor pr3 add remaining systemchannels (flutter/engine#7892)
flutter/engine@8427d73c8 Reland PerformanceOverlayLayer golden test (flutter/engine#7863)
flutter/engine@61fc1786f Roll src/third_party/dart c92d5ca288..5ddd157809 (153 commits)
flutter/engine@b0671145a Roll src/third_party/skia 7738736f9622..e471c05f92e8 (23 commits) (flutter/engine#7889)
flutter/engine@6d7eb5218 Revert "Android embedding refactor pr3 add remaining systemchannels (flutter/engine#7874)" (flutter#7886)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 21, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 21, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 21, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 21, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 22, 2019
cbracken added a commit to cbracken/flutter that referenced this pull request Feb 22, 2019
flutter/engine@f1f19bba8 Revert "Revert "Revert "Reland PerformanceOverlayLayer golden test (flutter/engine#7863)" (flutter/engine#7895)" (flutter/engine#7911)" (flutter/engine#7916)
flutter/engine@5db4b3772 Revert dart rolls (flutter/engine#7913)
flutter/engine@0053c1d50 Roll src/third_party/dart 75ee523f91..4cff5a4fd6 (6 commits)
flutter/engine@8620579cf Roll src/third_party/skia 9a049e6ce39d..63c4d3596915 (8 commits) (flutter/engine#7909)
flutter/engine@aa2b287cb Reland flutter/engine#7777 with proper LICENSE (flutter/engine#7888)
flutter/engine@a5773d121 Do not add ghost runs for trailing whitespace if the text is ellipsized (flutter/engine#7906)
flutter/engine@93eeb48ba Revert "Revert "Remove unnecessary entry-point closurization. (flutter/engine#7827)" (flutter/engine#7876)" (flutter/engine#7904)
flutter/engine@bbaeba3f3 Roll src/third_party/skia 05ff93c43ea5..9a049e6ce39d (11 commits) (flutter/engine#7903)
flutter/engine@1cf6b8b64 Roll src/third_party/dart 5ddd157809..75ee523f91 (19 commits)
flutter/engine@be32040ef Roll src/third_party/skia 348227b89430..05ff93c43ea5 (2 commits) (flutter/engine#7901)
flutter/engine@293b3de98 Roll src/third_party/skia 20ebd0cb3882..348227b89430 (4 commits) (flutter/engine#7900)
flutter/engine@6e6020d29 Eliminate .member = foo struct initialization (flutter/engine#7899)
flutter/engine@6d8bd99af Revert "Reland PerformanceOverlayLayer golden test (flutter/engine#7863)" (flutter/engine#7895)
flutter/engine@39f7066b6 Test profile and release build and unit tests (flutter/engine#7880)
flutter/engine@abe9826a9 Add accessibility semantics support to embedder (flutter/engine#7891)
flutter/engine@ce7016e1f Roll src/third_party/skia e471c05f92e8..20ebd0cb3882 (4 commits) (flutter/engine#7894)
flutter/engine@684c9394c Respect the custom GL proc table when creating the resource context on the IO thread. (flutter/engine#7893)
flutter/engine@e11d0e96f Android embedding refactor pr5 add flutterengine impl (flutter/engine#7878)
flutter/engine@2f4a38dbd Android embedding refactor pr3 add remaining systemchannels (flutter/engine#7892)
flutter/engine@8427d73c8 Reland PerformanceOverlayLayer golden test (flutter/engine#7863)
flutter/engine@61fc1786f Roll src/third_party/dart c92d5ca288..5ddd157809 (153 commits)
flutter/engine@b0671145a Roll src/third_party/skia 7738736f9622..e471c05f92e8 (23 commits) (flutter/engine#7889)
flutter/engine@6d7eb5218 Revert "Android embedding refactor pr3 add remaining systemchannels (flutter/engine#7874)" (flutter/engine#7886)
flutter/engine@dad6ec01c Correct onAccessibilityFeaturesChanged docs (flutter/engine#7883)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 22, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 22, 2019
cbracken added a commit to flutter/flutter that referenced this pull request Feb 22, 2019
flutter/engine@f1f19bba8 Revert "Revert "Revert "Reland PerformanceOverlayLayer golden test (flutter/engine#7863)" (flutter/engine#7895)" (flutter/engine#7911)" (flutter/engine#7916)
flutter/engine@5db4b3772 Revert dart rolls (flutter/engine#7913)
flutter/engine@0053c1d50 Roll src/third_party/dart 75ee523f91..4cff5a4fd6 (6 commits)
flutter/engine@8620579cf Roll src/third_party/skia 9a049e6ce39d..63c4d3596915 (8 commits) (flutter/engine#7909)
flutter/engine@aa2b287cb Reland flutter/engine#7777 with proper LICENSE (flutter/engine#7888)
flutter/engine@a5773d121 Do not add ghost runs for trailing whitespace if the text is ellipsized (flutter/engine#7906)
flutter/engine@93eeb48ba Revert "Revert "Remove unnecessary entry-point closurization. (flutter/engine#7827)" (flutter/engine#7876)" (flutter/engine#7904)
flutter/engine@bbaeba3f3 Roll src/third_party/skia 05ff93c43ea5..9a049e6ce39d (11 commits) (flutter/engine#7903)
flutter/engine@1cf6b8b64 Roll src/third_party/dart 5ddd157809..75ee523f91 (19 commits)
flutter/engine@be32040ef Roll src/third_party/skia 348227b89430..05ff93c43ea5 (2 commits) (flutter/engine#7901)
flutter/engine@293b3de98 Roll src/third_party/skia 20ebd0cb3882..348227b89430 (4 commits) (flutter/engine#7900)
flutter/engine@6e6020d29 Eliminate .member = foo struct initialization (flutter/engine#7899)
flutter/engine@6d8bd99af Revert "Reland PerformanceOverlayLayer golden test (flutter/engine#7863)" (flutter/engine#7895)
flutter/engine@39f7066b6 Test profile and release build and unit tests (flutter/engine#7880)
flutter/engine@abe9826a9 Add accessibility semantics support to embedder (flutter/engine#7891)
flutter/engine@ce7016e1f Roll src/third_party/skia e471c05f92e8..20ebd0cb3882 (4 commits) (flutter/engine#7894)
flutter/engine@684c9394c Respect the custom GL proc table when creating the resource context on the IO thread. (flutter/engine#7893)
flutter/engine@e11d0e96f Android embedding refactor pr5 add flutterengine impl (flutter/engine#7878)
flutter/engine@2f4a38dbd Android embedding refactor pr3 add remaining systemchannels (flutter/engine#7892)
flutter/engine@8427d73c8 Reland PerformanceOverlayLayer golden test (flutter/engine#7863)
flutter/engine@61fc1786f Roll src/third_party/dart c92d5ca288..5ddd157809 (153 commits)
flutter/engine@b0671145a Roll src/third_party/skia 7738736f9622..e471c05f92e8 (23 commits) (flutter/engine#7889)
flutter/engine@6d7eb5218 Revert "Android embedding refactor pr3 add remaining systemchannels (flutter/engine#7874)" (flutter/engine#7886)
flutter/engine@dad6ec01c Correct onAccessibilityFeaturesChanged docs (flutter/engine#7883)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants