isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl/onscreen/egl: Move struct fields to instance private

Browse Source 
This is so a derivable type can be declared later.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1514>
This commit is contained in:
Jonas Ådahl 2020-10-17 23:18:15 +02:00 committed by Robert Mader
parent 3e4ece50d3
commit f60943afc9
1 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
cogl/cogl/winsys/cogl-onscreen-egl.c
View File

@ -32,26 +32,43 @@
#include "cogl-trace.h" #include "cogl-trace.h"
#include "winsys/cogl-winsys-egl-private.h" #include "winsys/cogl-winsys-egl-private.h"
typedef struct _CoglOnscreenEgl typedef struct _CoglOnscreenEglPrivate
{ {
EGLSurface egl_surface; EGLSurface egl_surface;
/* Platform specific data */ /* Platform specific data */
void *platform; void *platform;
} CoglOnscreenEglPrivate;
typedef struct _CoglOnscreenEgl
{
CoglOnscreenEglPrivate *priv;
} CoglOnscreenEgl; } CoglOnscreenEgl;
CoglOnscreenEgl * CoglOnscreenEgl *
cogl_onscreen_egl_new (void) cogl_onscreen_egl_new (void)
{ {
return g_slice_new0 (CoglOnscreenEgl); CoglOnscreenEgl *onscreen_egl;
onscreen_egl = g_slice_new0 (CoglOnscreenEgl);
onscreen_egl->priv = g_new0 (CoglOnscreenEglPrivate, 1);
return onscreen_egl;
} }
void void
cogl_onscreen_egl_free (CoglOnscreenEgl *onscreen_egl) cogl_onscreen_egl_free (CoglOnscreenEgl *onscreen_egl)
{ {
g_free (onscreen_egl->priv);
g_slice_free (CoglOnscreenEgl, onscreen_egl); g_slice_free (CoglOnscreenEgl, onscreen_egl);
} }
static CoglOnscreenEglPrivate *
cogl_onscreen_egl_get_instance_private (CoglOnscreenEgl *onscreen_egl)
{
return onscreen_egl->priv;
}
gboolean gboolean
_cogl_winsys_onscreen_egl_init (CoglOnscreen *onscreen, _cogl_winsys_onscreen_egl_init (CoglOnscreen *onscreen,
GError **error) GError **error)
@ -98,7 +115,7 @@ _cogl_winsys_onscreen_egl_init (CoglOnscreen *onscreen,
cogl_framebuffer_update_samples_per_pixel (framebuffer, samples); cogl_framebuffer_update_samples_per_pixel (framebuffer, samples);
} }
winsys = g_slice_new0 (CoglOnscreenEgl); winsys = cogl_onscreen_egl_new ();
cogl_onscreen_set_winsys (onscreen, winsys); cogl_onscreen_set_winsys (onscreen, winsys);
if (egl_renderer->platform_vtable->onscreen_init && if (egl_renderer->platform_vtable->onscreen_init &&
@ -116,18 +133,20 @@ _cogl_winsys_onscreen_egl_init (CoglOnscreen *onscreen,
void void
_cogl_winsys_onscreen_egl_deinit (CoglOnscreen *onscreen) _cogl_winsys_onscreen_egl_deinit (CoglOnscreen *onscreen)
{ {
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = cogl_framebuffer_get_context (framebuffer); CoglContext *context = cogl_framebuffer_get_context (framebuffer);
CoglDisplayEGL *egl_display = context->display->winsys; CoglDisplayEGL *egl_display = context->display->winsys;
CoglRenderer *renderer = context->display->renderer; CoglRenderer *renderer = context->display->renderer;
CoglRendererEGL *egl_renderer = renderer->winsys; CoglRendererEGL *egl_renderer = renderer->winsys;
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
/* If we never successfully allocated then there's nothing to do */ /* If we never successfully allocated then there's nothing to do */
if (onscreen_egl == NULL) if (onscreen_egl == NULL)
return; return;
if (onscreen_egl->egl_surface != EGL_NO_SURFACE) if (priv->egl_surface != EGL_NO_SURFACE)
{ {
/* Cogl always needs a valid context bound to something so if we /* Cogl always needs a valid context bound to something so if we
* are destroying the onscreen that is currently bound we'll * are destroying the onscreen that is currently bound we'll
@ -135,8 +154,8 @@ _cogl_winsys_onscreen_egl_deinit (CoglOnscreen *onscreen)
if ((egl_display->dummy_surface != EGL_NO_SURFACE || if ((egl_display->dummy_surface != EGL_NO_SURFACE ||
(egl_renderer->private_features & (egl_renderer->private_features &
COGL_EGL_WINSYS_FEATURE_SURFACELESS_CONTEXT) != 0) && COGL_EGL_WINSYS_FEATURE_SURFACELESS_CONTEXT) != 0) &&
(egl_display->current_draw_surface == onscreen_egl->egl_surface || (egl_display->current_draw_surface == priv->egl_surface ||
egl_display->current_read_surface == onscreen_egl->egl_surface)) egl_display->current_read_surface == priv->egl_surface))
{ {
_cogl_winsys_egl_make_current (context->display, _cogl_winsys_egl_make_current (context->display,
egl_display->dummy_surface, egl_display->dummy_surface,
@ -144,10 +163,10 @@ _cogl_winsys_onscreen_egl_deinit (CoglOnscreen *onscreen)
egl_display->current_context); egl_display->current_context);
} }
if (eglDestroySurface (egl_renderer->edpy, onscreen_egl->egl_surface) if (eglDestroySurface (egl_renderer->edpy, priv->egl_surface)
== EGL_FALSE) == EGL_FALSE)
g_warning ("Failed to destroy EGL surface"); g_warning ("Failed to destroy EGL surface");
onscreen_egl->egl_surface = EGL_NO_SURFACE; priv->egl_surface = EGL_NO_SURFACE;
} }
if (egl_renderer->platform_vtable->onscreen_deinit) if (egl_renderer->platform_vtable->onscreen_deinit)
@ -161,13 +180,15 @@ static gboolean
bind_onscreen_with_context (CoglOnscreen *onscreen, bind_onscreen_with_context (CoglOnscreen *onscreen,
EGLContext egl_context) EGLContext egl_context)
{ {
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = cogl_framebuffer_get_context (framebuffer); CoglContext *context = cogl_framebuffer_get_context (framebuffer);
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
gboolean status = _cogl_winsys_egl_make_current (context->display, gboolean status = _cogl_winsys_egl_make_current (context->display,
onscreen_egl->egl_surface, priv->egl_surface,
onscreen_egl->egl_surface, priv->egl_surface,
egl_context); egl_context);
if (status) if (status)
{ {
@ -203,13 +224,15 @@ _cogl_winsys_onscreen_egl_bind (CoglOnscreen *onscreen)
int int
_cogl_winsys_onscreen_egl_get_buffer_age (CoglOnscreen *onscreen) _cogl_winsys_onscreen_egl_get_buffer_age (CoglOnscreen *onscreen)
{ {
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = cogl_framebuffer_get_context (framebuffer); CoglContext *context = cogl_framebuffer_get_context (framebuffer);
CoglRenderer *renderer = context->display->renderer; CoglRenderer *renderer = context->display->renderer;
CoglRendererEGL *egl_renderer = renderer->winsys; CoglRendererEGL *egl_renderer = renderer->winsys;
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
CoglDisplayEGL *egl_display = context->display->winsys; CoglDisplayEGL *egl_display = context->display->winsys;
EGLSurface surface = onscreen_egl->egl_surface; EGLSurface surface = priv->egl_surface;
static gboolean warned = FALSE; static gboolean warned = FALSE;
int age = 0; int age = 0;
@ -242,11 +265,13 @@ _cogl_winsys_onscreen_egl_swap_region (CoglOnscreen *onscreen,
CoglFrameInfo *info, CoglFrameInfo *info,
gpointer user_data) gpointer user_data)
{ {
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = cogl_framebuffer_get_context (framebuffer); CoglContext *context = cogl_framebuffer_get_context (framebuffer);
CoglRenderer *renderer = context->display->renderer; CoglRenderer *renderer = context->display->renderer;
CoglRendererEGL *egl_renderer = renderer->winsys; CoglRendererEGL *egl_renderer = renderer->winsys;
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
int framebuffer_height = cogl_framebuffer_get_height (framebuffer); int framebuffer_height = cogl_framebuffer_get_height (framebuffer);
int *rectangles = g_alloca (sizeof (int) * n_rectangles * 4); int *rectangles = g_alloca (sizeof (int) * n_rectangles * 4);
int i; int i;
@ -270,7 +295,7 @@ _cogl_winsys_onscreen_egl_swap_region (CoglOnscreen *onscreen,
COGL_FRAMEBUFFER_STATE_BIND); COGL_FRAMEBUFFER_STATE_BIND);
if (egl_renderer->pf_eglSwapBuffersRegion (egl_renderer->edpy, if (egl_renderer->pf_eglSwapBuffersRegion (egl_renderer->edpy,
onscreen_egl->egl_surface, priv->egl_surface,
n_rectangles, n_rectangles,
rectangles) == EGL_FALSE) rectangles) == EGL_FALSE)
g_warning ("Error reported by eglSwapBuffersRegion"); g_warning ("Error reported by eglSwapBuffersRegion");
@ -283,11 +308,13 @@ _cogl_winsys_onscreen_egl_swap_buffers_with_damage (CoglOnscreen *onscreen,
CoglFrameInfo *info, CoglFrameInfo *info,
gpointer user_data) gpointer user_data)
{ {
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
CoglContext *context = cogl_framebuffer_get_context (framebuffer); CoglContext *context = cogl_framebuffer_get_context (framebuffer);
CoglRenderer *renderer = context->display->renderer; CoglRenderer *renderer = context->display->renderer;
CoglRendererEGL *egl_renderer = renderer->winsys; CoglRendererEGL *egl_renderer = renderer->winsys;
CoglOnscreenEgl *onscreen_egl = cogl_onscreen_get_winsys (onscreen);
COGL_TRACE_BEGIN_SCOPED (CoglOnscreenEGLSwapBuffersWithDamage, COGL_TRACE_BEGIN_SCOPED (CoglOnscreenEGLSwapBuffersWithDamage,
"Onscreen (eglSwapBuffers)"); "Onscreen (eglSwapBuffers)");
@ -319,37 +346,49 @@ _cogl_winsys_onscreen_egl_swap_buffers_with_damage (CoglOnscreen *onscreen,
} }
if (egl_renderer->pf_eglSwapBuffersWithDamage (egl_renderer->edpy, if (egl_renderer->pf_eglSwapBuffersWithDamage (egl_renderer->edpy,
onscreen_egl->egl_surface, priv->egl_surface,
flipped, flipped,
n_rectangles) == EGL_FALSE) n_rectangles) == EGL_FALSE)
g_warning ("Error reported by eglSwapBuffersWithDamage"); g_warning ("Error reported by eglSwapBuffersWithDamage");
} }
else else
eglSwapBuffers (egl_renderer->edpy, onscreen_egl->egl_surface); eglSwapBuffers (egl_renderer->edpy, priv->egl_surface);
} }
void void
cogl_onscreen_egl_set_platform (CoglOnscreenEgl *onscreen_egl, cogl_onscreen_egl_set_platform (CoglOnscreenEgl *onscreen_egl,
gpointer platform) gpointer platform)
{ {
onscreen_egl->platform = platform; CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
priv->platform = platform;
} }
gpointer gpointer
cogl_onscreen_egl_get_platform (CoglOnscreenEgl *onscreen_egl) cogl_onscreen_egl_get_platform (CoglOnscreenEgl *onscreen_egl)
{ {
return onscreen_egl->platform; CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
return priv->platform;
} }
void void
cogl_onscreen_egl_set_egl_surface (CoglOnscreenEgl *onscreen_egl, cogl_onscreen_egl_set_egl_surface (CoglOnscreenEgl *onscreen_egl,
EGLSurface egl_surface) EGLSurface egl_surface)
{ {
onscreen_egl->egl_surface = egl_surface; CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
priv->egl_surface = egl_surface;
} }
EGLSurface EGLSurface
cogl_onscreen_egl_get_egl_surface (CoglOnscreenEgl *onscreen_egl) cogl_onscreen_egl_get_egl_surface (CoglOnscreenEgl *onscreen_egl)
{ {
return onscreen_egl->egl_surface; CoglOnscreenEglPrivate *priv =
cogl_onscreen_egl_get_instance_private (onscreen_egl);
return priv->egl_surface;
} }