Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 2868251

Browse files
authored
Remove rarely used GLConnection stuff in flow. (#3440)
I had added this initially as a means of making it easier to deal with OpenGL directly in Flow. However, we are moving away from dealing with the client rendering APIs directly. Instead, delegating everything to Skia. Besides, we only ever used this to log the GPU description in case of context setup failures. This has not proved to be useful so far. Also, having this in place is making it difficult to remove all dependencies on GL in Shell.
1 parent e5f16da commit 2868251

File tree

6 files changed

+2
-309
lines changed

6 files changed

+2
-309
lines changed

flow/BUILD.gn

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,5 @@ source_set("flow") {
6161
"//apps/mozart/lib/skia",
6262
"//apps/mozart/services/composition",
6363
]
64-
} else {
65-
sources += [
66-
"gl_connection.cc",
67-
"gl_connection.h",
68-
"open_gl.h",
69-
]
7064
}
7165
}

flow/gl_connection.cc

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

flow/gl_connection.h

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

flow/open_gl.h

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

shell/gpu/gpu_surface_gl.cc

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include "gpu_surface_gl.h"
66

7-
#include "flutter/flow/gl_connection.h"
87
#include "flutter/glue/trace_event.h"
98
#include "lib/ftl/arraysize.h"
109
#include "lib/ftl/logging.h"
@@ -50,9 +49,7 @@ bool GPUSurfaceGL::Setup() {
5049
sk_sp<GrContext>(GrContext::Create(kOpenGL_GrBackend, backend_context));
5150

5251
if (context_ == nullptr) {
53-
flow::GLConnection connection;
54-
FTL_LOG(INFO) << "Failed to setup GL context. Aborting.";
55-
FTL_LOG(INFO) << connection.Description();
52+
FTL_LOG(INFO) << "Failed to setup Skia Gr context.";
5653
return false;
5754
}
5855

travis/licenses.golden

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14159,15 +14159,12 @@ FILE: ../../../flutter/content_handler/rasterizer.cc
1415914159
FILE: ../../../flutter/content_handler/rasterizer.h
1416014160
FILE: ../../../flutter/content_handler/runtime_holder.cc
1416114161
FILE: ../../../flutter/content_handler/runtime_holder.h
14162-
FILE: ../../../flutter/flow/gl_connection.cc
14163-
FILE: ../../../flutter/flow/gl_connection.h
1416414162
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.cc
1416514163
FILE: ../../../flutter/flow/layers/backdrop_filter_layer.h
1416614164
FILE: ../../../flutter/flow/layers/child_scene_layer.cc
1416714165
FILE: ../../../flutter/flow/layers/child_scene_layer.h
1416814166
FILE: ../../../flutter/flow/layers/shader_mask_layer.cc
1416914167
FILE: ../../../flutter/flow/layers/shader_mask_layer.h
14170-
FILE: ../../../flutter/flow/open_gl.h
1417114168
FILE: ../../../flutter/flow/process_info.h
1417214169
FILE: ../../../flutter/flow/raster_cache.cc
1417314170
FILE: ../../../flutter/flow/raster_cache.h
@@ -72119,4 +72116,4 @@ freely, subject to the following restrictions:
7211972116
3. This notice may not be removed or altered from any source distribution.
7212072117
====================================================================================================
7212172118
Total license count: 695
72122-
31553 of 31553 ██████████ 100% (0 missing licenses) Done.
72119+
31550 of 31550 ██████████ 100% (0 missing licenses) Done.

0 commit comments

Comments
 (0)