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

Implement an EGL resource context for the Linux shell. #18918

Merged
robert-ancell merged 5 commits into from
Jun 11, 2020
+78 −6
Merged

Implement an EGL resource context for the Linux shell. #18918

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b61e0b
Log EGL errors
robert-ancell Jun 9, 2020
50c69ae
Implement an EGL resource context for the Linux shell.
robert-ancell Jun 4, 2020
bde0c79
Don't make resource context creation fatal
robert-ancell Jun 9, 2020
4c6f8c1
Refactor out create_resource_surface
robert-ancell Jun 9, 2020
d851357
Merge branch 'master' into linux-shell-resource-context
robert-ancell Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into linux-shell-resource-context
  • Loading branch information
@robert-ancell
robert-ancell committed Jun 9, 2020
commit d8513571f97439b3ca813b028356a46155476c21
3 changes: 3 additions & 0 deletions shell/platform/linux/fl_renderer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,9 @@ gboolean fl_renderer_make_resource_current(FlRenderer* self, GError** error) {
FlRendererPrivate* priv =
static_cast<FlRendererPrivate*>(fl_renderer_get_instance_private(self));

if (priv->resource_surface == nullptr || priv->resource_context == nullptr)
return FALSE;

if (!eglMakeCurrent(priv->egl_display, priv->resource_surface,
priv->resource_surface, priv->resource_context)) {
g_set_error(error, fl_renderer_error_quark(), FL_RENDERER_ERROR_FAILED,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.