Skip to content

Commit ee0e814

Browse files
committed
Revert "Reland "[Windows] Move to FlutterCompositor for rendering" (flutter#49262)"
This reverts commit 00d7d23.
1 parent 194d90d commit ee0e814

22 files changed

+43
-933
lines changed

ci/licenses_golden/excluded_files

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,6 @@
369369
../../../flutter/shell/platform/windows/client_wrapper/flutter_view_unittests.cc
370370
../../../flutter/shell/platform/windows/client_wrapper/plugin_registrar_windows_unittests.cc
371371
../../../flutter/shell/platform/windows/client_wrapper/testing
372-
../../../flutter/shell/platform/windows/compositor_opengl_unittests.cc
373-
../../../flutter/shell/platform/windows/compositor_software_unittests.cc
374372
../../../flutter/shell/platform/windows/cursor_handler_unittests.cc
375373
../../../flutter/shell/platform/windows/direct_manipulation_unittests.cc
376374
../../../flutter/shell/platform/windows/dpi_utils_unittests.cc

ci/licenses_golden/licenses_flutter

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7201,11 +7201,6 @@ ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/f
72017201
ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h + ../../../flutter/LICENSE
72027202
ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h + ../../../flutter/LICENSE
72037203
ORIGIN: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h + ../../../flutter/LICENSE
7204-
ORIGIN: ../../../flutter/shell/platform/windows/compositor.h + ../../../flutter/LICENSE
7205-
ORIGIN: ../../../flutter/shell/platform/windows/compositor_opengl.cc + ../../../flutter/LICENSE
7206-
ORIGIN: ../../../flutter/shell/platform/windows/compositor_opengl.h + ../../../flutter/LICENSE
7207-
ORIGIN: ../../../flutter/shell/platform/windows/compositor_software.cc + ../../../flutter/LICENSE
7208-
ORIGIN: ../../../flutter/shell/platform/windows/compositor_software.h + ../../../flutter/LICENSE
72097204
ORIGIN: ../../../flutter/shell/platform/windows/cursor_handler.cc + ../../../flutter/LICENSE
72107205
ORIGIN: ../../../flutter/shell/platform/windows/cursor_handler.h + ../../../flutter/LICENSE
72117206
ORIGIN: ../../../flutter/shell/platform/windows/direct_manipulation.cc + ../../../flutter/LICENSE
@@ -10044,11 +10039,6 @@ FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flu
1004410039
FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view.h
1004510040
FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/flutter_view_controller.h
1004610041
FILE: ../../../flutter/shell/platform/windows/client_wrapper/include/flutter/plugin_registrar_windows.h
10047-
FILE: ../../../flutter/shell/platform/windows/compositor.h
10048-
FILE: ../../../flutter/shell/platform/windows/compositor_opengl.cc
10049-
FILE: ../../../flutter/shell/platform/windows/compositor_opengl.h
10050-
FILE: ../../../flutter/shell/platform/windows/compositor_software.cc
10051-
FILE: ../../../flutter/shell/platform/windows/compositor_software.h
1005210042
FILE: ../../../flutter/shell/platform/windows/cursor_handler.cc
1005310043
FILE: ../../../flutter/shell/platform/windows/cursor_handler.h
1005410044
FILE: ../../../flutter/shell/platform/windows/direct_manipulation.cc

impeller/renderer/backend/gles/description_gles.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,6 @@ std::string DescriptionGLES::GetString() const {
156156
return stream.str();
157157
}
158158

159-
Version DescriptionGLES::GetGlVersion() const {
160-
return gl_version_;
161-
}
162-
163159
bool DescriptionGLES::IsES() const {
164160
return is_es_;
165161
}

impeller/renderer/backend/gles/description_gles.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ class DescriptionGLES {
2727

2828
std::string GetString() const;
2929

30-
Version GetGlVersion() const;
31-
3230
bool HasExtension(const std::string& ext) const;
3331

3432
/// @brief Returns whether GLES includes the debug extension.

shell/platform/linux/fl_backing_store_provider.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ uint32_t fl_backing_store_provider_get_gl_format(FlBackingStoreProvider* self) {
8282
// In Linux kN32_SkColorType is assumed to be kBGRA_8888_SkColorType.
8383
// So we must choose a valid gl format to be compatible with surface format
8484
// BGRA8.
85-
// Following logics are copied from Skia GrGLCaps.cpp:
86-
// https://github.com/google/skia/blob/4738ed711e03212aceec3cd502a4adb545f38e63/src/gpu/ganesh/gl/GrGLCaps.cpp#L1963-L2116
85+
// Following logics are copied from Skia GrGLCaps.cpp.
8786

8887
if (epoxy_is_desktop_gl()) {
8988
// For OpenGL.

shell/platform/windows/BUILD.gn

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ source_set("flutter_windows_source") {
4242
"accessibility_bridge_windows.h",
4343
"angle_surface_manager.cc",
4444
"angle_surface_manager.h",
45-
"compositor.h",
46-
"compositor_opengl.cc",
47-
"compositor_opengl.h",
48-
"compositor_software.cc",
49-
"compositor_software.h",
5045
"cursor_handler.cc",
5146
"cursor_handler.h",
5247
"direct_manipulation.cc",
@@ -139,7 +134,6 @@ source_set("flutter_windows_source") {
139134
deps = [
140135
":flutter_windows_headers",
141136
"//flutter/fml:fml",
142-
"//flutter/impeller/renderer/backend/gles",
143137
"//flutter/shell/platform/common:common_cpp",
144138
"//flutter/shell/platform/common:common_cpp_input",
145139
"//flutter/shell/platform/common:common_cpp_switches",
@@ -181,8 +175,6 @@ executable("flutter_windows_unittests") {
181175
# Common Windows test sources.
182176
sources = [
183177
"accessibility_bridge_windows_unittests.cc",
184-
"compositor_opengl_unittests.cc",
185-
"compositor_software_unittests.cc",
186178
"cursor_handler_unittests.cc",
187179
"direct_manipulation_unittests.cc",
188180
"dpi_utils_unittests.cc",
@@ -243,7 +235,6 @@ executable("flutter_windows_unittests") {
243235
":flutter_windows_fixtures",
244236
":flutter_windows_headers",
245237
":flutter_windows_source",
246-
"//flutter/impeller/renderer/backend/gles",
247238
"//flutter/shell/platform/common:common_cpp",
248239
"//flutter/shell/platform/common/client_wrapper:client_wrapper",
249240
"//flutter/shell/platform/embedder:embedder_as_internal_library",

shell/platform/windows/compositor.h

Lines changed: 0 additions & 39 deletions
This file was deleted.

shell/platform/windows/compositor_opengl.cc

Lines changed: 0 additions & 188 deletions
This file was deleted.

shell/platform/windows/compositor_opengl.h

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)