renderer: drop MIR support
This commit is contained in:
Ray Strode
Rui Matos
parent
639ef8e195
commit
ce8aa45fa4
@ -478,12 +478,6 @@ cogl_sources_c += \
|
|||||||
winsys/cogl-winsys-egl-android.c \
|
winsys/cogl-winsys-egl-android.c \
|
||||||
winsys/cogl-winsys-egl-android-private.h
|
winsys/cogl-winsys-egl-android-private.h
|
||||||
endif
|
endif
|
||||||
if SUPPORT_EGL_PLATFORM_MIR
|
|
||||||
cogl_experimental_h += cogl-mir-renderer.h
|
|
||||||
cogl_sources_c += \
|
|
||||||
winsys/cogl-winsys-egl-mir.c \
|
|
||||||
winsys/cogl-winsys-egl-mir-private.h
|
|
||||||
endif
|
|
||||||
if SUPPORT_EGL
|
if SUPPORT_EGL
|
||||||
cogl_experimental_h += cogl-egl.h
|
cogl_experimental_h += cogl-egl.h
|
||||||
cogl_nodist_experimental_h += cogl-egl-defines.h
|
cogl_nodist_experimental_h += cogl-egl-defines.h
|
||||||
|
|||||||
@ -1,145 +0,0 @@
|
|||||||
/*
|
|
||||||
* Cogl
|
|
||||||
*
|
|
||||||
* A Low Level GPU Graphics and Utilities API
|
|
||||||
*
|
|
||||||
* Copyright (C) 2014 Canonical Ltd.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person
|
|
||||||
* obtaining a copy of this software and associated documentation
|
|
||||||
* files (the "Software"), to deal in the Software without
|
|
||||||
* restriction, including without limitation the rights to use, copy,
|
|
||||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION)
|
|
||||||
#error "Only <cogl/cogl.h> can be included directly."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __COGL_MIR_RENDERER_H__
|
|
||||||
#define __COGL_MIR_RENDERER_H__
|
|
||||||
|
|
||||||
#include <cogl/cogl-types.h>
|
|
||||||
#include <cogl/cogl-renderer.h>
|
|
||||||
|
|
||||||
#include <mir_toolkit/mir_client_library.h>
|
|
||||||
|
|
||||||
COGL_BEGIN_DECLS
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cogl_mir_renderer_set_foreign_connection:
|
|
||||||
* @renderer: A #CoglRenderer
|
|
||||||
* @connection: A Mir connection
|
|
||||||
*
|
|
||||||
* Allows you to explicitly control what Mir connection you want Cogl
|
|
||||||
* to work with instead of leaving Cogl to automatically connect to a
|
|
||||||
* mir server.
|
|
||||||
*
|
|
||||||
* Returns: whether @connection has been marked as been set as connection or not.
|
|
||||||
*
|
|
||||||
* Since: 1.8
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
CoglBool
|
|
||||||
cogl_mir_renderer_set_foreign_connection (CoglRenderer *renderer,
|
|
||||||
MirConnection *connection);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cogl_mir_renderer_get_connection:
|
|
||||||
* @renderer: A #CoglRenderer
|
|
||||||
*
|
|
||||||
* Retrieves the Mir Connection that Cogl is using. If a foreign
|
|
||||||
* connection has been specified using
|
|
||||||
* cogl_mir_renderer_set_foreign_connection() then that connection will
|
|
||||||
* be returned. If no foreign connection has been specified then the
|
|
||||||
* display that Cogl creates internally will be returned unless the
|
|
||||||
* renderer has not yet been connected (either implicitly or explicitly by
|
|
||||||
* calling cogl_renderer_connect()) in which case %NULL is returned.
|
|
||||||
*
|
|
||||||
* Returns: The mir connection currently associated with @renderer,
|
|
||||||
* or %NULL if the renderer hasn't yet been connected and no
|
|
||||||
* foreign connection has been specified.
|
|
||||||
*
|
|
||||||
* Since: 1.8
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
MirConnection *
|
|
||||||
cogl_mir_renderer_get_connection (CoglRenderer *renderer);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* CoglMirEvent:
|
|
||||||
* @onscreen: pointer to a #CoglOnscreen structure
|
|
||||||
* @surface: pointer to a #MirSurface structure
|
|
||||||
* @event: pointer to a #MirEvent structure
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
CoglOnscreen *onscreen;
|
|
||||||
MirSurface *surface;
|
|
||||||
MirEvent *event;
|
|
||||||
} CoglMirEvent;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* CoglMirEventCallback:
|
|
||||||
* @event: pointer to a CoglMirEvent structure
|
|
||||||
* @data: (closure): the data that was given when the filter was added
|
|
||||||
*
|
|
||||||
* A callback function that can be registered with
|
|
||||||
* cogl_mir_renderer_add_event_listener().
|
|
||||||
*
|
|
||||||
* Since: 1.8
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
typedef void (* CoglMirEventCallback) (CoglMirEvent *event,
|
|
||||||
void *data);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* cogl_mir_renderer_add_event_listener:
|
|
||||||
* @renderer: a #CoglRenderer
|
|
||||||
* @func: the callback function
|
|
||||||
* @data: user data passed to @func when called
|
|
||||||
*
|
|
||||||
* Adds a callback function that will receive all native events.
|
|
||||||
*
|
|
||||||
* Since: 1.8
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
cogl_mir_renderer_add_event_listener (CoglRenderer *renderer,
|
|
||||||
CoglMirEventCallback func,
|
|
||||||
void *data);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* cogl_mir_renderer_remove_event_listener:
|
|
||||||
* @renderer: a #CoglRenderer
|
|
||||||
* @func: the callback function
|
|
||||||
* @data: user data given when the callback was installed
|
|
||||||
*
|
|
||||||
* Removes a callback that was previously added with
|
|
||||||
* cogl_mir_renderer_add_filter().
|
|
||||||
*
|
|
||||||
* Since: 1.8
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
cogl_mir_renderer_remove_event_listener (CoglRenderer *renderer,
|
|
||||||
CoglMirEventCallback func,
|
|
||||||
void *data);
|
|
||||||
|
|
||||||
COGL_END_DECLS
|
|
||||||
|
|
||||||
#endif /* __COGL_MIR_RENDERER_H__ */
|
|
||||||
@ -69,10 +69,6 @@ struct _CoglOnscreen
|
|||||||
struct wl_surface *foreign_surface;
|
struct wl_surface *foreign_surface;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
|
|
||||||
struct MirSurface *foreign_surface;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CoglBool swap_throttled;
|
CoglBool swap_throttled;
|
||||||
|
|
||||||
CoglList frame_closures;
|
CoglList frame_closures;
|
||||||
|
|||||||
@ -233,65 +233,6 @@ cogl_wayland_onscreen_resize (CoglOnscreen *onscreen,
|
|||||||
int offset_y);
|
int offset_y);
|
||||||
#endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */
|
#endif /* COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT */
|
||||||
|
|
||||||
#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
|
|
||||||
/**
|
|
||||||
* cogl_mir_onscreen_get_surface:
|
|
||||||
* @onscreen: A #CoglOnscreen framebuffer
|
|
||||||
*
|
|
||||||
* Allows you to get the internal #MirSurface linked to the given @onscreen.
|
|
||||||
* This function might return %NULL if the @onscreen has not been allocated
|
|
||||||
* (see cogl_framebuffer_allocate() for more details)
|
|
||||||
*
|
|
||||||
* Returns: (transfer none): a #MirSurface or %NULL.
|
|
||||||
*
|
|
||||||
* Since: 1.18
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
struct MirSurface *
|
|
||||||
cogl_mir_onscreen_get_surface (CoglOnscreen *onscreen);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cogl_mir_onscreen_set_foreign_surface:
|
|
||||||
* @onscreen: An unallocated framebuffer.
|
|
||||||
* @surface A Mir surface to associate with the @onscreen.
|
|
||||||
*
|
|
||||||
* Allows you to explicitly notify Cogl of an existing Mir surface to use,
|
|
||||||
* which prevents Cogl from allocating a surface for the @onscreen.
|
|
||||||
* An allocated surface will not be destroyed when the @onscreen is freed.
|
|
||||||
*
|
|
||||||
* This function must be called before @onscreen is allocated.
|
|
||||||
*
|
|
||||||
* Returns: whether @surface has been set as surface or not.
|
|
||||||
*
|
|
||||||
* Since: 1.18
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
CoglBool
|
|
||||||
cogl_mir_onscreen_set_foreign_surface (CoglOnscreen *onscreen,
|
|
||||||
struct MirSurface *surface);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cogl_mir_onscreen_resize:
|
|
||||||
* @onscreen: A #CoglOnscreen framebuffer
|
|
||||||
* @width: The desired width of the framebuffer
|
|
||||||
* @height: The desired height of the framebuffer
|
|
||||||
*
|
|
||||||
* Resizes the backbuffer of the given @onscreen framebuffer to the
|
|
||||||
* given size.
|
|
||||||
*
|
|
||||||
* Note that if some drawing commands have been applied to the
|
|
||||||
* framebuffer since the last swap buffers then the resize will be
|
|
||||||
* queued and will only take effect in the next swap buffers.
|
|
||||||
*
|
|
||||||
* Since: 1.18
|
|
||||||
* Stability: unstable
|
|
||||||
*/
|
|
||||||
void
|
|
||||||
cogl_mir_onscreen_resize (CoglOnscreen *onscreen,
|
|
||||||
int width,
|
|
||||||
int height);
|
|
||||||
#endif /* COGL_HAS_EGL_PLATFORM_MIR_SUPPORT */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cogl_onscreen_set_swap_throttled:
|
* cogl_onscreen_set_swap_throttled:
|
||||||
* @onscreen: A #CoglOnscreen framebuffer
|
* @onscreen: A #CoglOnscreen framebuffer
|
||||||
|
|||||||
@ -48,9 +48,6 @@
|
|||||||
#include <wayland-client.h>
|
#include <wayland-client.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
|
|
||||||
#include <mir_toolkit/mir_client_library.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct _CoglRenderer
|
struct _CoglRenderer
|
||||||
{
|
{
|
||||||
@ -88,10 +85,6 @@ struct _CoglRenderer
|
|||||||
CoglBool wayland_enable_event_dispatch;
|
CoglBool wayland_enable_event_dispatch;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
|
|
||||||
MirConnection *foreign_mir_connection;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
|
#if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
|
||||||
int kms_fd;
|
int kms_fd;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -63,9 +63,6 @@
|
|||||||
#ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
|
#ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
|
||||||
#include "cogl-winsys-egl-android-private.h"
|
#include "cogl-winsys-egl-android-private.h"
|
||||||
#endif
|
#endif
|
||||||
#ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
|
|
||||||
#include "cogl-winsys-egl-mir-private.h"
|
|
||||||
#endif
|
|
||||||
#ifdef COGL_HAS_GLX_SUPPORT
|
#ifdef COGL_HAS_GLX_SUPPORT
|
||||||
#include "cogl-winsys-glx-private.h"
|
#include "cogl-winsys-glx-private.h"
|
||||||
#endif
|
#endif
|
||||||
@ -185,9 +182,6 @@ static CoglWinsysVtableGetter _cogl_winsys_vtable_getters[] =
|
|||||||
#endif
|
#endif
|
||||||
#ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
|
#ifdef COGL_HAS_EGL_PLATFORM_ANDROID_SUPPORT
|
||||||
_cogl_winsys_egl_android_get_vtable,
|
_cogl_winsys_egl_android_get_vtable,
|
||||||
#endif
|
|
||||||
#ifdef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT
|
|
||||||
_cogl_winsys_egl_mir_get_vtable,
|
|
||||||
#endif
|
#endif
|
||||||
_cogl_winsys_stub_get_vtable,
|
_cogl_winsys_stub_get_vtable,
|
||||||
};
|
};
|
||||||
|
|||||||
@ -164,7 +164,6 @@ cogl_renderer_new (void);
|
|||||||
* @COGL_WINSYS_ID_EGL_WAYLAND: Use EGL with the Wayland window system
|
* @COGL_WINSYS_ID_EGL_WAYLAND: Use EGL with the Wayland window system
|
||||||
* @COGL_WINSYS_ID_EGL_KMS: Use EGL with the KMS platform
|
* @COGL_WINSYS_ID_EGL_KMS: Use EGL with the KMS platform
|
||||||
* @COGL_WINSYS_ID_EGL_ANDROID: Use EGL with the Android platform
|
* @COGL_WINSYS_ID_EGL_ANDROID: Use EGL with the Android platform
|
||||||
* @COGL_WINSYS_ID_EGL_MIR: Use EGL with the Mir server
|
|
||||||
*
|
*
|
||||||
* Identifies specific window system backends that Cogl supports.
|
* Identifies specific window system backends that Cogl supports.
|
||||||
*
|
*
|
||||||
@ -180,7 +179,6 @@ typedef enum
|
|||||||
COGL_WINSYS_ID_EGL_WAYLAND,
|
COGL_WINSYS_ID_EGL_WAYLAND,
|
||||||
COGL_WINSYS_ID_EGL_KMS,
|
COGL_WINSYS_ID_EGL_KMS,
|
||||||
COGL_WINSYS_ID_EGL_ANDROID,
|
COGL_WINSYS_ID_EGL_ANDROID,
|
||||||
COGL_WINSYS_ID_EGL_MIR,
|
|
||||||
} CoglWinsysID;
|
} CoglWinsysID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -138,9 +138,6 @@
|
|||||||
#include <cogl/cogl-kms-renderer.h>
|
#include <cogl/cogl-kms-renderer.h>
|
||||||
#include <cogl/cogl-kms-display.h>
|
#include <cogl/cogl-kms-display.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined (COGL_HAS_EGL_PLATFORM_MIR_SUPPORT)
|
|
||||||
#include <cogl/cogl-mir-renderer.h>
|
|
||||||
#endif
|
|
||||||
#ifdef COGL_HAS_GLIB_SUPPORT
|
#ifdef COGL_HAS_GLIB_SUPPORT
|
||||||
#include <cogl/cogl-glib-source.h>
|
#include <cogl/cogl-glib-source.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,39 +0,0 @@
|
|||||||
/*
|
|
||||||
* Cogl
|
|
||||||
*
|
|
||||||
* A Low-Level GPU Graphics and Utilities API
|
|
||||||
*
|
|
||||||
* Copyright (C) 2011 Canonical Ltd.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person
|
|
||||||
* obtaining a copy of this software and associated documentation
|
|
||||||
* files (the "Software"), to deal in the Software without
|
|
||||||
* restriction, including without limitation the rights to use, copy,
|
|
||||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef __COGL_WINSYS_EGL_MIR_PRIVATE_H
|
|
||||||
#define __COGL_WINSYS_EGL_MIR_PRIVATE_H
|
|
||||||
|
|
||||||
#include "cogl-winsys-private.h"
|
|
||||||
|
|
||||||
const CoglWinsysVtable *
|
|
||||||
_cogl_winsys_egl_mir_get_vtable (void);
|
|
||||||
|
|
||||||
#endif /* __COGL_WINSYS_EGL_MIR_PRIVATE_H */
|
|
||||||
@ -1,865 +0,0 @@
|
|||||||
/*
|
|
||||||
* Cogl
|
|
||||||
*
|
|
||||||
* A Low-Level GPU Graphics and Utilities API
|
|
||||||
*
|
|
||||||
* Copyright (C) 2014 Canonical Ltd.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person
|
|
||||||
* obtaining a copy of this software and associated documentation
|
|
||||||
* files (the "Software"), to deal in the Software without
|
|
||||||
* restriction, including without limitation the rights to use, copy,
|
|
||||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
|
||||||
* of the Software, and to permit persons to whom the Software is
|
|
||||||
* furnished to do so, subject to the following conditions:
|
|
||||||
*
|
|
||||||
* The above copyright notice and this permission notice shall be
|
|
||||||
* included in all copies or substantial portions of the Software.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
||||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
||||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
||||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
||||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
* SOFTWARE.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Marco Trevisan <marco.trevisan@canonical.com>
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <mir_toolkit/mir_client_library.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#include "cogl-winsys-egl-mir-private.h"
|
|
||||||
#include "cogl-winsys-egl-private.h"
|
|
||||||
#include "cogl-renderer-private.h"
|
|
||||||
#include "cogl-onscreen-private.h"
|
|
||||||
#include "cogl-output-private.h"
|
|
||||||
#include "cogl-mir-renderer.h"
|
|
||||||
#include "cogl-error-private.h"
|
|
||||||
|
|
||||||
static const CoglWinsysEGLVtable _cogl_winsys_egl_vtable;
|
|
||||||
|
|
||||||
static const CoglWinsysVtable *parent_vtable;
|
|
||||||
|
|
||||||
typedef struct _CoglRendererMir
|
|
||||||
{
|
|
||||||
MirConnection *mir_connection;
|
|
||||||
} CoglRendererMir;
|
|
||||||
|
|
||||||
typedef struct _CoglDisplayMir
|
|
||||||
{
|
|
||||||
MirSurface *dummy_mir_surface;
|
|
||||||
} CoglDisplayMir;
|
|
||||||
|
|
||||||
typedef struct _CoglOnscreenMir
|
|
||||||
{
|
|
||||||
MirSurface *mir_surface;
|
|
||||||
MirSurfaceState last_state;
|
|
||||||
|
|
||||||
CoglBool requested_resize;
|
|
||||||
int requested_width;
|
|
||||||
int requested_height;
|
|
||||||
GMutex mir_event_lock;
|
|
||||||
} CoglOnscreenMir;
|
|
||||||
|
|
||||||
|
|
||||||
static MirPixelFormat
|
|
||||||
_mir_connection_get_valid_format (MirConnection *connection)
|
|
||||||
{
|
|
||||||
MirPixelFormat formats[mir_pixel_formats];
|
|
||||||
uint32_t valid_formats;
|
|
||||||
uint32_t f;
|
|
||||||
|
|
||||||
mir_connection_get_available_surface_formats(connection, formats,
|
|
||||||
mir_pixel_formats,
|
|
||||||
&valid_formats);
|
|
||||||
|
|
||||||
for (f = 0; f < valid_formats; f++)
|
|
||||||
{
|
|
||||||
switch (formats[f])
|
|
||||||
{
|
|
||||||
case mir_pixel_format_abgr_8888:
|
|
||||||
case mir_pixel_format_xbgr_8888:
|
|
||||||
case mir_pixel_format_argb_8888:
|
|
||||||
case mir_pixel_format_xrgb_8888:
|
|
||||||
return formats[f];
|
|
||||||
default:
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return mir_pixel_format_invalid;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cogl_winsys_renderer_disconnect (CoglRenderer *renderer)
|
|
||||||
{
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglRendererMir *mir_renderer = egl_renderer->platform;
|
|
||||||
|
|
||||||
if (egl_renderer->edpy)
|
|
||||||
eglTerminate (egl_renderer->edpy);
|
|
||||||
|
|
||||||
if (mir_connection_is_valid (mir_renderer->mir_connection))
|
|
||||||
{
|
|
||||||
if (!mir_connection_is_valid (renderer->foreign_mir_connection))
|
|
||||||
{
|
|
||||||
mir_connection_set_display_config_change_callback (mir_renderer->mir_connection,
|
|
||||||
NULL, NULL);
|
|
||||||
mir_connection_release (mir_renderer->mir_connection);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_list_free_full (renderer->outputs, (GDestroyNotify)cogl_object_unref);
|
|
||||||
renderer->outputs = NULL;
|
|
||||||
|
|
||||||
g_slice_free (CoglRendererMir, egl_renderer->platform);
|
|
||||||
g_slice_free (CoglRendererEGL, egl_renderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static gchar *
|
|
||||||
_mir_output_get_name (MirDisplayOutput *output)
|
|
||||||
{
|
|
||||||
g_return_val_if_fail (output, NULL);
|
|
||||||
|
|
||||||
switch (output->type)
|
|
||||||
{
|
|
||||||
case mir_display_output_type_unknown:
|
|
||||||
return g_strdup_printf ("None-%u", output->output_id);
|
|
||||||
case mir_display_output_type_vga:
|
|
||||||
return g_strdup_printf ("VGA-%u", output->output_id);
|
|
||||||
case mir_display_output_type_dvii:
|
|
||||||
case mir_display_output_type_dvid:
|
|
||||||
case mir_display_output_type_dvia:
|
|
||||||
return g_strdup_printf ("DVI-%u", output->output_id);
|
|
||||||
case mir_display_output_type_composite:
|
|
||||||
return g_strdup_printf ("Composite-%u", output->output_id);
|
|
||||||
case mir_display_output_type_lvds:
|
|
||||||
return g_strdup_printf ("LVDS-%u", output->output_id);
|
|
||||||
case mir_display_output_type_component:
|
|
||||||
return g_strdup_printf ("CTV-%u", output->output_id);
|
|
||||||
case mir_display_output_type_ninepindin:
|
|
||||||
return g_strdup_printf ("DIN-%u", output->output_id);
|
|
||||||
case mir_display_output_type_displayport:
|
|
||||||
return g_strdup_printf ("DP-%u", output->output_id);
|
|
||||||
case mir_display_output_type_hdmia:
|
|
||||||
case mir_display_output_type_hdmib:
|
|
||||||
return g_strdup_printf ("HDMI-%u", output->output_id);
|
|
||||||
case mir_display_output_type_svideo:
|
|
||||||
case mir_display_output_type_tv:
|
|
||||||
return g_strdup_printf ("TV-%u", output->output_id);
|
|
||||||
case mir_display_output_type_edp:
|
|
||||||
return g_strdup_printf ("eDP-%u", output->output_id);
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_mir_update_outputs (CoglRenderer *renderer)
|
|
||||||
{
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglRendererMir *mir_renderer = egl_renderer->platform;
|
|
||||||
MirDisplayConfiguration *dpy_config;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
g_list_free_full (renderer->outputs, (GDestroyNotify)cogl_object_unref);
|
|
||||||
renderer->outputs = NULL;
|
|
||||||
|
|
||||||
dpy_config = mir_connection_create_display_config (mir_renderer->mir_connection);
|
|
||||||
|
|
||||||
for (i = dpy_config->num_outputs-1; i >= 0 ; i--)
|
|
||||||
{
|
|
||||||
MirDisplayOutput *o = &dpy_config->outputs[i];
|
|
||||||
MirDisplayMode *mode;
|
|
||||||
CoglOutput *output;
|
|
||||||
gchar *output_name;
|
|
||||||
|
|
||||||
if (!o->used)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
output_name = _mir_output_get_name (o);
|
|
||||||
mode = &o->modes[o->current_mode];
|
|
||||||
|
|
||||||
output = _cogl_output_new (output_name);
|
|
||||||
output->x = o->position_x;
|
|
||||||
output->y = o->position_y;
|
|
||||||
output->width = mode->horizontal_resolution;
|
|
||||||
output->height = mode->vertical_resolution;
|
|
||||||
output->mm_width = o->physical_width_mm;
|
|
||||||
output->mm_height = o->physical_height_mm;
|
|
||||||
output->refresh_rate = mode->refresh_rate;
|
|
||||||
|
|
||||||
/* FIXME, mir does not support this yet */
|
|
||||||
output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
|
|
||||||
|
|
||||||
renderer->outputs = g_list_prepend (renderer->outputs, output);
|
|
||||||
|
|
||||||
g_free (output_name);
|
|
||||||
}
|
|
||||||
|
|
||||||
mir_display_config_destroy (dpy_config);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_mir_display_config_changed_cb(MirConnection* connection, void* data)
|
|
||||||
{
|
|
||||||
CoglRenderer *renderer = data;
|
|
||||||
const CoglWinsysVtable *winsys = renderer->winsys_vtable;
|
|
||||||
|
|
||||||
_mir_update_outputs (renderer);
|
|
||||||
|
|
||||||
if (winsys->renderer_outputs_changed != NULL)
|
|
||||||
winsys->renderer_outputs_changed (renderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglBool
|
|
||||||
_cogl_winsys_renderer_connect (CoglRenderer *renderer,
|
|
||||||
CoglError **error)
|
|
||||||
{
|
|
||||||
CoglRendererEGL *egl_renderer;
|
|
||||||
CoglRendererMir *mir_renderer;
|
|
||||||
MirEGLNativeDisplayType mir_native_dpy;
|
|
||||||
|
|
||||||
renderer->winsys = g_slice_new0 (CoglRendererEGL);
|
|
||||||
egl_renderer = renderer->winsys;
|
|
||||||
mir_renderer = g_slice_new0 (CoglRendererMir);
|
|
||||||
egl_renderer->platform = mir_renderer;
|
|
||||||
|
|
||||||
egl_renderer->platform_vtable = &_cogl_winsys_egl_vtable;
|
|
||||||
|
|
||||||
if (mir_connection_is_valid (renderer->foreign_mir_connection))
|
|
||||||
{
|
|
||||||
mir_renderer->mir_connection = renderer->foreign_mir_connection;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
mir_renderer->mir_connection = mir_connect_sync (NULL, "Cogl Mir Renderer");
|
|
||||||
if (!mir_connection_is_valid (mir_renderer->mir_connection))
|
|
||||||
{
|
|
||||||
_cogl_set_error (error, COGL_WINSYS_ERROR,
|
|
||||||
COGL_WINSYS_ERROR_INIT,
|
|
||||||
"Failed to connect mir display: %s",
|
|
||||||
mir_connection_get_error_message (mir_renderer->mir_connection));
|
|
||||||
mir_connection_release (mir_renderer->mir_connection);
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mir_native_dpy =
|
|
||||||
mir_connection_get_egl_native_display (mir_renderer->mir_connection);
|
|
||||||
egl_renderer->edpy =
|
|
||||||
eglGetDisplay (mir_native_dpy);
|
|
||||||
|
|
||||||
if (!_cogl_winsys_egl_renderer_connect_common (renderer, error))
|
|
||||||
goto error;
|
|
||||||
|
|
||||||
_mir_update_outputs (renderer);
|
|
||||||
|
|
||||||
if (!mir_connection_is_valid (renderer->foreign_mir_connection))
|
|
||||||
{
|
|
||||||
/* FIXME: we can't add a config change callback for a foreign connection
|
|
||||||
* or we'll block other callbacks on that */
|
|
||||||
mir_connection_set_display_config_change_callback (mir_renderer->mir_connection,
|
|
||||||
_mir_display_config_changed_cb,
|
|
||||||
renderer);
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
error:
|
|
||||||
_cogl_winsys_renderer_disconnect (renderer);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglBool
|
|
||||||
_cogl_winsys_egl_display_setup (CoglDisplay *display,
|
|
||||||
CoglError **error)
|
|
||||||
{
|
|
||||||
CoglDisplayEGL *egl_display = display->winsys;
|
|
||||||
CoglDisplayMir *mir_display;
|
|
||||||
|
|
||||||
mir_display = g_slice_new0 (CoglDisplayMir);
|
|
||||||
egl_display->platform = mir_display;
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cogl_winsys_egl_display_destroy (CoglDisplay *display)
|
|
||||||
{
|
|
||||||
CoglDisplayEGL *egl_display = display->winsys;
|
|
||||||
|
|
||||||
g_slice_free (CoglDisplayMir, egl_display->platform);
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglBool
|
|
||||||
make_dummy_surface (CoglDisplay *display,
|
|
||||||
CoglError **error)
|
|
||||||
{
|
|
||||||
CoglRenderer *renderer = display->renderer;
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglRendererMir *mir_renderer = egl_renderer->platform;
|
|
||||||
CoglDisplayEGL *egl_display = display->winsys;
|
|
||||||
CoglDisplayMir *mir_display = egl_display->platform;
|
|
||||||
MirEGLNativeWindowType dummy_mir_egl_native_window;
|
|
||||||
MirSurfaceParameters surfaceparm;
|
|
||||||
const char *error_message;
|
|
||||||
const char *error_detail = "";
|
|
||||||
|
|
||||||
surfaceparm.name = "CoglDummySurface";
|
|
||||||
surfaceparm.width = 1;
|
|
||||||
surfaceparm.height = 1;
|
|
||||||
surfaceparm.pixel_format = _mir_connection_get_valid_format (mir_renderer->mir_connection);
|
|
||||||
surfaceparm.buffer_usage = mir_buffer_usage_hardware;
|
|
||||||
surfaceparm.output_id = mir_display_output_id_invalid;
|
|
||||||
|
|
||||||
mir_display->dummy_mir_surface =
|
|
||||||
mir_connection_create_surface_sync (mir_renderer->mir_connection, &surfaceparm);
|
|
||||||
|
|
||||||
if (!mir_surface_is_valid (mir_display->dummy_mir_surface))
|
|
||||||
{
|
|
||||||
error_message = "Failed to create a dummy mir surface";
|
|
||||||
error_detail = mir_surface_get_error_message (mir_display->dummy_mir_surface);
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
dummy_mir_egl_native_window =
|
|
||||||
mir_surface_get_egl_native_window (mir_display->dummy_mir_surface);
|
|
||||||
if (!dummy_mir_egl_native_window)
|
|
||||||
{
|
|
||||||
error_message = "Failed to get a dummy mir native egl surface";
|
|
||||||
error_detail = mir_surface_get_error_message (mir_display->dummy_mir_surface);
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
egl_display->dummy_surface =
|
|
||||||
eglCreateWindowSurface (egl_renderer->edpy,
|
|
||||||
egl_display->egl_config,
|
|
||||||
(EGLNativeWindowType) dummy_mir_egl_native_window,
|
|
||||||
NULL);
|
|
||||||
if (egl_display->dummy_surface == EGL_NO_SURFACE)
|
|
||||||
{
|
|
||||||
error_message = "Unable to create dummy window surface";
|
|
||||||
goto fail;
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
|
|
||||||
fail:
|
|
||||||
_cogl_set_error (error, COGL_WINSYS_ERROR,
|
|
||||||
COGL_WINSYS_ERROR_CREATE_CONTEXT,
|
|
||||||
"%s%s%s", error_message,
|
|
||||||
error_detail != '\0' ? ": " : "",
|
|
||||||
error_detail);
|
|
||||||
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglBool
|
|
||||||
_cogl_winsys_egl_context_created (CoglDisplay *display,
|
|
||||||
CoglError **error)
|
|
||||||
{
|
|
||||||
CoglRenderer *renderer = display->renderer;
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglDisplayEGL *egl_display = display->winsys;
|
|
||||||
|
|
||||||
if ((egl_renderer->private_features &
|
|
||||||
COGL_EGL_WINSYS_FEATURE_SURFACELESS_CONTEXT) == 0 &&
|
|
||||||
!make_dummy_surface(display, error))
|
|
||||||
return FALSE;
|
|
||||||
|
|
||||||
if (!_cogl_winsys_egl_make_current (display,
|
|
||||||
egl_display->dummy_surface,
|
|
||||||
egl_display->dummy_surface,
|
|
||||||
egl_display->egl_context))
|
|
||||||
{
|
|
||||||
_cogl_set_error (error,
|
|
||||||
COGL_WINSYS_ERROR,
|
|
||||||
COGL_WINSYS_ERROR_CREATE_CONTEXT,
|
|
||||||
"%s",
|
|
||||||
"Unable to eglMakeCurrent with dummy surface");
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cogl_winsys_egl_cleanup_context (CoglDisplay *display)
|
|
||||||
{
|
|
||||||
CoglRenderer *renderer = display->renderer;
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglDisplayEGL *egl_display = display->winsys;
|
|
||||||
CoglDisplayMir *mir_display = egl_display->platform;
|
|
||||||
|
|
||||||
if (egl_display->dummy_surface != EGL_NO_SURFACE)
|
|
||||||
{
|
|
||||||
eglDestroySurface (egl_renderer->edpy, egl_display->dummy_surface);
|
|
||||||
egl_display->dummy_surface = EGL_NO_SURFACE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mir_display->dummy_mir_surface)
|
|
||||||
{
|
|
||||||
mir_surface_release_sync (mir_display->dummy_mir_surface);
|
|
||||||
mir_display->dummy_mir_surface = NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglBool
|
|
||||||
_cogl_winsys_egl_context_init (CoglContext *context,
|
|
||||||
CoglError **error)
|
|
||||||
{
|
|
||||||
COGL_FLAGS_SET (context->features,
|
|
||||||
COGL_FEATURE_ID_ONSCREEN_MULTIPLE, TRUE);
|
|
||||||
COGL_FLAGS_SET (context->winsys_features,
|
|
||||||
COGL_WINSYS_FEATURE_MULTIPLE_ONSCREEN,
|
|
||||||
TRUE);
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
flush_pending_resize_notifications_cb (void *data,
|
|
||||||
void *user_data)
|
|
||||||
{
|
|
||||||
CoglFramebuffer *framebuffer = data;
|
|
||||||
|
|
||||||
if (framebuffer->type == COGL_FRAMEBUFFER_TYPE_ONSCREEN)
|
|
||||||
{
|
|
||||||
CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
g_mutex_lock (&mir_onscreen->mir_event_lock);
|
|
||||||
|
|
||||||
if (egl_onscreen->pending_resize_notify)
|
|
||||||
{
|
|
||||||
int w = mir_onscreen->requested_width;
|
|
||||||
int h = mir_onscreen->requested_height;
|
|
||||||
|
|
||||||
_cogl_framebuffer_winsys_update_size (framebuffer, w, h);
|
|
||||||
_cogl_onscreen_notify_resize (onscreen);
|
|
||||||
|
|
||||||
egl_onscreen->pending_resize_notify = FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
g_mutex_unlock (&mir_onscreen->mir_event_lock);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
flush_pending_resize_notifications_idle (void *user_data)
|
|
||||||
{
|
|
||||||
CoglContext *context = user_data;
|
|
||||||
CoglRenderer *renderer = context->display->renderer;
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
|
|
||||||
/* This needs to be disconnected before invoking the callbacks in
|
|
||||||
* case the callbacks cause it to be queued again */
|
|
||||||
_cogl_closure_disconnect (egl_renderer->resize_notify_idle);
|
|
||||||
egl_renderer->resize_notify_idle = NULL;
|
|
||||||
|
|
||||||
g_list_foreach (context->framebuffers,
|
|
||||||
flush_pending_resize_notifications_cb,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void _mir_surface_event_cb (MirSurface *surface,
|
|
||||||
MirEvent const *event,
|
|
||||||
void *data)
|
|
||||||
{
|
|
||||||
CoglOnscreen *onscreen = data;
|
|
||||||
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
|
|
||||||
CoglContext *context = framebuffer->context;
|
|
||||||
CoglRenderer *renderer = context->display->renderer;
|
|
||||||
CoglMirEvent mir_event = { onscreen, surface, (MirEvent *) event };
|
|
||||||
|
|
||||||
if (event->type == mir_event_type_resize)
|
|
||||||
{
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
g_mutex_lock (&mir_onscreen->mir_event_lock);
|
|
||||||
|
|
||||||
egl_onscreen->pending_resize_notify = TRUE;
|
|
||||||
mir_onscreen->requested_width = event->resize.width;
|
|
||||||
mir_onscreen->requested_height = event->resize.height;
|
|
||||||
|
|
||||||
if (!egl_renderer->resize_notify_idle)
|
|
||||||
{
|
|
||||||
egl_renderer->resize_notify_idle =
|
|
||||||
_cogl_poll_renderer_add_idle (renderer,
|
|
||||||
flush_pending_resize_notifications_idle,
|
|
||||||
context,
|
|
||||||
NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_mutex_unlock (&mir_onscreen->mir_event_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
_cogl_renderer_handle_native_event (renderer, &mir_event);
|
|
||||||
}
|
|
||||||
|
|
||||||
static CoglBool
|
|
||||||
_cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
|
|
||||||
EGLConfig egl_config,
|
|
||||||
CoglError **error)
|
|
||||||
{
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen;
|
|
||||||
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
|
|
||||||
CoglContext *context = framebuffer->context;
|
|
||||||
CoglRenderer *renderer = context->display->renderer;
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglRendererMir *mir_renderer = egl_renderer->platform;
|
|
||||||
MirEGLNativeWindowType mir_egl_native_window;
|
|
||||||
MirSurfaceParameters surfaceparm;
|
|
||||||
MirEventDelegate event_handler;
|
|
||||||
|
|
||||||
mir_onscreen = g_slice_new0 (CoglOnscreenMir);
|
|
||||||
egl_onscreen->platform = mir_onscreen;
|
|
||||||
|
|
||||||
if (mir_surface_is_valid (onscreen->foreign_surface))
|
|
||||||
{
|
|
||||||
mir_onscreen->mir_surface = onscreen->foreign_surface;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
surfaceparm.name = g_get_prgname ();
|
|
||||||
surfaceparm.width = cogl_framebuffer_get_width (framebuffer);
|
|
||||||
surfaceparm.height = cogl_framebuffer_get_height (framebuffer);
|
|
||||||
surfaceparm.pixel_format = _mir_connection_get_valid_format (mir_renderer->mir_connection);
|
|
||||||
surfaceparm.buffer_usage = mir_buffer_usage_hardware;
|
|
||||||
surfaceparm.output_id = mir_display_output_id_invalid;
|
|
||||||
mir_onscreen->mir_surface =
|
|
||||||
mir_connection_create_surface_sync (mir_renderer->mir_connection, &surfaceparm);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!mir_surface_is_valid (mir_onscreen->mir_surface))
|
|
||||||
{
|
|
||||||
_cogl_set_error (error, COGL_WINSYS_ERROR,
|
|
||||||
COGL_WINSYS_ERROR_CREATE_ONSCREEN,
|
|
||||||
"Error while creating mir surface for CoglOnscreen: %s",
|
|
||||||
mir_surface_get_error_message (mir_onscreen->mir_surface));
|
|
||||||
mir_surface_release_sync (mir_onscreen->mir_surface);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
mir_egl_native_window = mir_surface_get_egl_native_window (mir_onscreen->mir_surface);
|
|
||||||
if (!mir_egl_native_window)
|
|
||||||
{
|
|
||||||
_cogl_set_error (error, COGL_WINSYS_ERROR,
|
|
||||||
COGL_WINSYS_ERROR_CREATE_ONSCREEN,
|
|
||||||
"Error while getting mir egl native window "
|
|
||||||
"for CoglOnscreen: %s",
|
|
||||||
mir_surface_get_error_message (mir_onscreen->mir_surface));
|
|
||||||
mir_surface_release_sync (mir_onscreen->mir_surface);
|
|
||||||
return FALSE;
|
|
||||||
}
|
|
||||||
|
|
||||||
egl_onscreen->egl_surface =
|
|
||||||
eglCreateWindowSurface (egl_renderer->edpy,
|
|
||||||
egl_config,
|
|
||||||
(EGLNativeWindowType) mir_egl_native_window,
|
|
||||||
NULL);
|
|
||||||
|
|
||||||
mir_onscreen->last_state = mir_surface_get_state (mir_onscreen->mir_surface);
|
|
||||||
|
|
||||||
if (!mir_surface_is_valid (onscreen->foreign_surface))
|
|
||||||
{
|
|
||||||
event_handler.callback = _mir_surface_event_cb;
|
|
||||||
event_handler.context = onscreen;
|
|
||||||
mir_surface_set_event_handler (mir_onscreen->mir_surface, &event_handler);
|
|
||||||
g_mutex_init (&mir_onscreen->mir_event_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cogl_winsys_egl_onscreen_deinit (CoglOnscreen *onscreen)
|
|
||||||
{
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
if (mir_onscreen->mir_surface && !onscreen->foreign_surface)
|
|
||||||
{
|
|
||||||
mir_surface_set_event_handler (mir_onscreen->mir_surface, NULL);
|
|
||||||
mir_surface_release_sync (mir_onscreen->mir_surface);
|
|
||||||
g_mutex_clear (&mir_onscreen->mir_event_lock);
|
|
||||||
mir_onscreen->mir_surface = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
mir_onscreen->last_state = mir_surface_state_unknown;
|
|
||||||
|
|
||||||
g_slice_free (CoglOnscreenMir, mir_onscreen);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cogl_winsys_onscreen_set_visibility (CoglOnscreen *onscreen,
|
|
||||||
CoglBool visibility)
|
|
||||||
{
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen = egl_onscreen->platform;
|
|
||||||
MirSurfaceState new_state, current_state;
|
|
||||||
|
|
||||||
current_state = mir_surface_get_state (mir_onscreen->mir_surface);
|
|
||||||
|
|
||||||
if ((visibility && current_state != mir_surface_state_minimized) ||
|
|
||||||
(!visibility && current_state == mir_surface_state_minimized))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!visibility)
|
|
||||||
{
|
|
||||||
new_state = mir_surface_state_minimized;
|
|
||||||
mir_onscreen->last_state = current_state;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
new_state = mir_onscreen->last_state;
|
|
||||||
}
|
|
||||||
|
|
||||||
mir_surface_set_state (mir_onscreen->mir_surface, new_state);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
mir_surface_recreate (CoglOnscreen *onscreen)
|
|
||||||
{
|
|
||||||
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen = egl_onscreen->platform;
|
|
||||||
const CoglWinsysVtable *winsys = _cogl_framebuffer_get_winsys (framebuffer);
|
|
||||||
MirSurfaceState last_state, current_state;
|
|
||||||
int w, h;
|
|
||||||
|
|
||||||
g_mutex_lock (&mir_onscreen->mir_event_lock);
|
|
||||||
mir_onscreen->requested_resize = FALSE;
|
|
||||||
w = mir_onscreen->requested_width;
|
|
||||||
h = mir_onscreen->requested_height;
|
|
||||||
last_state = mir_onscreen->last_state;
|
|
||||||
current_state = mir_surface_get_state (mir_onscreen->mir_surface);
|
|
||||||
g_mutex_unlock (&mir_onscreen->mir_event_lock);
|
|
||||||
|
|
||||||
winsys->onscreen_deinit (onscreen);
|
|
||||||
|
|
||||||
_cogl_framebuffer_winsys_update_size (framebuffer, w, h);
|
|
||||||
|
|
||||||
winsys->onscreen_init (onscreen, NULL);
|
|
||||||
winsys->onscreen_bind (onscreen);
|
|
||||||
|
|
||||||
egl_onscreen = onscreen->winsys;
|
|
||||||
mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
g_mutex_lock (&mir_onscreen->mir_event_lock);
|
|
||||||
mir_onscreen->last_state = last_state;
|
|
||||||
mir_surface_set_state (mir_onscreen->mir_surface, current_state);
|
|
||||||
_cogl_onscreen_queue_full_dirty (onscreen);
|
|
||||||
_cogl_onscreen_notify_resize (onscreen);
|
|
||||||
g_mutex_unlock (&mir_onscreen->mir_event_lock);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
_cogl_winsys_onscreen_swap_buffers_with_damage (CoglOnscreen *onscreen,
|
|
||||||
const int *rectangles,
|
|
||||||
int n_rectangles)
|
|
||||||
{
|
|
||||||
CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
|
|
||||||
CoglOnscreenMir *mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
if (mir_onscreen->requested_resize)
|
|
||||||
mir_surface_recreate (onscreen);
|
|
||||||
|
|
||||||
parent_vtable->onscreen_swap_buffers_with_damage (onscreen,
|
|
||||||
rectangles,
|
|
||||||
n_rectangles);
|
|
||||||
}
|
|
||||||
|
|
||||||
CoglBool
|
|
||||||
cogl_mir_renderer_set_foreign_connection (CoglRenderer *renderer,
|
|
||||||
MirConnection *connection)
|
|
||||||
{
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (cogl_is_renderer (renderer), FALSE);
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (mir_connection_is_valid (connection), FALSE);
|
|
||||||
|
|
||||||
/* NB: Renderers are considered immutable once connected */
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (!renderer->connected, FALSE);
|
|
||||||
|
|
||||||
renderer->foreign_mir_connection = connection;
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
MirConnection *
|
|
||||||
cogl_mir_renderer_get_connection (CoglRenderer *renderer)
|
|
||||||
{
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (cogl_is_renderer (renderer), NULL);
|
|
||||||
|
|
||||||
if (mir_connection_is_valid (renderer->foreign_mir_connection))
|
|
||||||
return renderer->foreign_mir_connection;
|
|
||||||
|
|
||||||
if (renderer->connected)
|
|
||||||
{
|
|
||||||
CoglRendererEGL *egl_renderer = renderer->winsys;
|
|
||||||
CoglRendererMir *mir_renderer = egl_renderer->platform;
|
|
||||||
|
|
||||||
if (mir_connection_is_valid (mir_renderer->mir_connection))
|
|
||||||
return mir_renderer->mir_connection;
|
|
||||||
}
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
cogl_mir_renderer_add_event_listener (CoglRenderer *renderer,
|
|
||||||
CoglMirEventCallback func,
|
|
||||||
void *data)
|
|
||||||
{
|
|
||||||
_COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer));
|
|
||||||
|
|
||||||
_cogl_renderer_add_native_filter (renderer,
|
|
||||||
(CoglNativeFilterFunc)func, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
cogl_mir_renderer_remove_event_listener (CoglRenderer *renderer,
|
|
||||||
CoglMirEventCallback func,
|
|
||||||
void *data)
|
|
||||||
{
|
|
||||||
_COGL_RETURN_IF_FAIL (cogl_is_renderer (renderer));
|
|
||||||
|
|
||||||
_cogl_renderer_remove_native_filter (renderer,
|
|
||||||
(CoglNativeFilterFunc)func, data);
|
|
||||||
}
|
|
||||||
|
|
||||||
CoglBool
|
|
||||||
cogl_mir_onscreen_set_foreign_surface (CoglOnscreen *onscreen,
|
|
||||||
MirSurface *surface)
|
|
||||||
{
|
|
||||||
CoglFramebuffer *fb;
|
|
||||||
MirSurfaceParameters parameters;
|
|
||||||
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (cogl_is_onscreen (surface), FALSE);
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (mir_surface_is_valid (surface), FALSE);
|
|
||||||
|
|
||||||
fb = COGL_FRAMEBUFFER (onscreen);
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (!fb->allocated, FALSE);
|
|
||||||
|
|
||||||
mir_surface_get_parameters (surface, ¶meters);
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (parameters.buffer_usage == mir_buffer_usage_hardware, FALSE);
|
|
||||||
|
|
||||||
onscreen->foreign_surface = surface;
|
|
||||||
return TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
MirSurface *
|
|
||||||
cogl_mir_onscreen_get_surface (CoglOnscreen *onscreen)
|
|
||||||
{
|
|
||||||
CoglOnscreenEGL *egl_onscreen;
|
|
||||||
CoglOnscreenMir *mir_onscreen;
|
|
||||||
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (cogl_is_onscreen (onscreen), NULL);
|
|
||||||
|
|
||||||
if (!COGL_FRAMEBUFFER (onscreen)->allocated)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
egl_onscreen = onscreen->winsys;
|
|
||||||
mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
if (mir_surface_is_valid (mir_onscreen->mir_surface))
|
|
||||||
return mir_onscreen->mir_surface;
|
|
||||||
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
cogl_mir_onscreen_resize (CoglOnscreen *onscreen,
|
|
||||||
int width,
|
|
||||||
int height)
|
|
||||||
{
|
|
||||||
CoglFramebuffer *framebuffer;
|
|
||||||
CoglOnscreenEGL *egl_onscreen;
|
|
||||||
CoglOnscreenMir *mir_onscreen;
|
|
||||||
|
|
||||||
_COGL_RETURN_VAL_IF_FAIL (cogl_is_onscreen (onscreen), NULL);
|
|
||||||
|
|
||||||
framebuffer = COGL_FRAMEBUFFER (onscreen);
|
|
||||||
|
|
||||||
if (cogl_framebuffer_get_width (framebuffer) == width &&
|
|
||||||
cogl_framebuffer_get_height (framebuffer) == height)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!framebuffer->allocated)
|
|
||||||
{
|
|
||||||
_cogl_framebuffer_winsys_update_size (framebuffer, width, height);
|
|
||||||
_cogl_onscreen_notify_resize (onscreen);
|
|
||||||
}
|
|
||||||
else if (!onscreen->foreign_surface)
|
|
||||||
{
|
|
||||||
egl_onscreen = onscreen->winsys;
|
|
||||||
mir_onscreen = egl_onscreen->platform;
|
|
||||||
|
|
||||||
g_mutex_lock (&mir_onscreen->mir_event_lock);
|
|
||||||
mir_onscreen->requested_resize = TRUE;
|
|
||||||
mir_onscreen->requested_width = width;
|
|
||||||
mir_onscreen->requested_height = height;
|
|
||||||
g_mutex_unlock (&mir_onscreen->mir_event_lock);
|
|
||||||
|
|
||||||
if (!framebuffer->mid_scene)
|
|
||||||
mir_surface_recreate (onscreen);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static const CoglWinsysEGLVtable
|
|
||||||
_cogl_winsys_egl_vtable =
|
|
||||||
{
|
|
||||||
.display_setup = _cogl_winsys_egl_display_setup,
|
|
||||||
.display_destroy = _cogl_winsys_egl_display_destroy,
|
|
||||||
.context_created = _cogl_winsys_egl_context_created,
|
|
||||||
.cleanup_context = _cogl_winsys_egl_cleanup_context,
|
|
||||||
.context_init = _cogl_winsys_egl_context_init,
|
|
||||||
.onscreen_init = _cogl_winsys_egl_onscreen_init,
|
|
||||||
.onscreen_deinit = _cogl_winsys_egl_onscreen_deinit
|
|
||||||
};
|
|
||||||
|
|
||||||
const CoglWinsysVtable *
|
|
||||||
_cogl_winsys_egl_mir_get_vtable (void)
|
|
||||||
{
|
|
||||||
static CoglBool vtable_inited = FALSE;
|
|
||||||
static CoglWinsysVtable vtable;
|
|
||||||
|
|
||||||
if (!vtable_inited)
|
|
||||||
{
|
|
||||||
/* The EGL_MIR winsys is a subclass of the EGL winsys so we
|
|
||||||
start by copying its vtable */
|
|
||||||
|
|
||||||
parent_vtable = _cogl_winsys_egl_get_vtable ();
|
|
||||||
vtable = *parent_vtable;
|
|
||||||
|
|
||||||
vtable.id = COGL_WINSYS_ID_EGL_MIR;
|
|
||||||
vtable.name = "EGL_MIR";
|
|
||||||
|
|
||||||
vtable.renderer_connect = _cogl_winsys_renderer_connect;
|
|
||||||
vtable.renderer_disconnect = _cogl_winsys_renderer_disconnect;
|
|
||||||
|
|
||||||
vtable.onscreen_set_visibility =
|
|
||||||
_cogl_winsys_onscreen_set_visibility;
|
|
||||||
vtable.onscreen_swap_buffers_with_damage =
|
|
||||||
_cogl_winsys_onscreen_swap_buffers_with_damage;
|
|
||||||
|
|
||||||
vtable_inited = TRUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
return &vtable;
|
|
||||||
}
|
|
||||||
23
configure.ac
23
configure.ac
@ -111,7 +111,6 @@ AC_SUBST([GI_REQ_VERSION], [gi_req_version])
|
|||||||
AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version])
|
AC_SUBST([UPROF_REQ_VERSION], [uprof_req_version])
|
||||||
AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version])
|
AC_SUBST([WAYLAND_REQ_VERSION], [wayland_req_version])
|
||||||
AC_SUBST([WAYLAND_SERVER_REQ_VERSION], [wayland_server_req_version])
|
AC_SUBST([WAYLAND_SERVER_REQ_VERSION], [wayland_server_req_version])
|
||||||
AC_SUBST([MIRCLIENT_REQ_VERSION], [mirclient_req_version])
|
|
||||||
|
|
||||||
# Save this value here, since automake will set cflags later and we
|
# Save this value here, since automake will set cflags later and we
|
||||||
# want to know if the user specified custom cflags or not.
|
# want to know if the user specified custom cflags or not.
|
||||||
@ -939,28 +938,6 @@ AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_ANDROID,
|
|||||||
[test "x$enable_android_egl_platform" = "xyes"])
|
[test "x$enable_android_egl_platform" = "xyes"])
|
||||||
|
|
||||||
|
|
||||||
dnl Mir EGL platform
|
|
||||||
AC_ARG_ENABLE(
|
|
||||||
[mir-egl-platform],
|
|
||||||
[AC_HELP_STRING([--enable-mir-egl-platform=@<:@no/yes@:>@], [Enable support for the Mir egl platform @<:@default=no@:>@])],
|
|
||||||
[],
|
|
||||||
enable_mir_egl_platform=no
|
|
||||||
)
|
|
||||||
AS_IF([test "x$enable_mir_egl_platform" = "xyes"],
|
|
||||||
[
|
|
||||||
EGL_PLATFORM_COUNT=$((EGL_PLATFORM_COUNT+1))
|
|
||||||
NEED_EGL=yes
|
|
||||||
EGL_PLATFORMS="$EGL_PLATFORMS mir"
|
|
||||||
|
|
||||||
PKG_CHECK_MODULES(MIR_CLIENT,
|
|
||||||
[mirclient >= mirclient_req_version])
|
|
||||||
COGL_PKG_REQUIRES="$COGL_PKG_REQUIRES mirclient >= mirclient_req_version"
|
|
||||||
|
|
||||||
COGL_DEFINES_SYMBOLS="$COGL_DEFINES_SYMBOLS COGL_HAS_EGL_PLATFORM_MIR_SUPPORT"
|
|
||||||
])
|
|
||||||
AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_MIR,
|
|
||||||
[test "x$enable_mir_egl_platform" = "xyes"])
|
|
||||||
|
|
||||||
dnl This should go last, since it's the default fallback and we need
|
dnl This should go last, since it's the default fallback and we need
|
||||||
dnl to check the value of $EGL_PLATFORM_COUNT here.
|
dnl to check the value of $EGL_PLATFORM_COUNT here.
|
||||||
AC_ARG_ENABLE(
|
AC_ARG_ENABLE(
|
||||||
|
|||||||
@ -143,8 +143,6 @@ get_winsys_name_for_id (CoglWinsysID winsys_id)
|
|||||||
return "EGL + KMS platform";
|
return "EGL + KMS platform";
|
||||||
case COGL_WINSYS_ID_EGL_ANDROID:
|
case COGL_WINSYS_ID_EGL_ANDROID:
|
||||||
return "EGL + Android platform";
|
return "EGL + Android platform";
|
||||||
case COGL_WINSYS_ID_EGL_MIR:
|
|
||||||
return "EGL + Mir platform";
|
|
||||||
}
|
}
|
||||||
g_return_val_if_reached ("Unknown");
|
g_return_val_if_reached ("Unknown");
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user