← Back to branch summary

~noskcaj/ubuntu/trusty/cogl/1.16.2

« back to all changes in this revision

Viewing changes to cogl/winsys/cogl-winsys-egl-android.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Jeremy Bicha, Rico Tzschichholz
  • Date: 2013-02-26 16:43:25 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130226164325-t4z9rylpa20v0p6q
Tags: 1.13.4-0ubuntu1
[ Jeremy Bicha ]
* New upstream release
  - soname bump
* debian/control.in:
  - Bump minimum glib to 2.32
  - Drop obsolete breaks/replaces
  - Bump libclutter-1.0-dev breaks for soname transition
* debian/libcogl-dev.install:
  - Add some missing files

[ Rico Tzschichholz ]
* debian/control.in:
  - Build-depend on libxrandr-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
cogl/winsys/cogl-winsys-egl-android.c
69
69
 
70
70
static CoglBool
71
71
_cogl_winsys_renderer_connect (CoglRenderer *renderer,
72
 
                               GError **error)
 
72
                               CoglError **error)
73
73
{
74
74
  CoglRendererEGL *egl_renderer;
75
75
 
92
92
 
93
93
static CoglBool
94
94
_cogl_winsys_egl_context_created (CoglDisplay *display,
95
 
                                  GError **error)
 
95
                                  CoglError **error)
96
96
{
97
97
  CoglRenderer *renderer = display->renderer;
98
98
  CoglRendererEGL *egl_renderer = renderer->winsys;
154
154
  return TRUE;
155
155
 
156
156
 fail:
157
 
  g_set_error (error, COGL_WINSYS_ERROR,
 
157
  _cogl_set_error (error, COGL_WINSYS_ERROR,
158
158
               COGL_WINSYS_ERROR_CREATE_CONTEXT,
159
159
               "%s", error_message);
160
160
  return FALSE;
162
162
 
163
163
static CoglBool
164
164
_cogl_winsys_egl_display_setup (CoglDisplay *display,
165
 
                                GError **error)
 
165
                                CoglError **error)
166
166
{
167
167
  CoglDisplayEGL *egl_display = display->winsys;
168
168
  CoglDisplayAndroid *android_display;
184
184
static CoglBool
185
185
_cogl_winsys_egl_onscreen_init (CoglOnscreen *onscreen,
186
186
                                EGLConfig egl_config,
187
 
                                GError **error)
 
187
                                CoglError **error)
188
188
{
189
189
  CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (onscreen);
190
190
  CoglContext *context = framebuffer->context;
195
195
 
196
196
  if (android_display->have_onscreen)
197
197
    {
198
 
      g_set_error (error, COGL_WINSYS_ERROR,
 
198
      _cogl_set_error (error, COGL_WINSYS_ERROR,
199
199
                   COGL_WINSYS_ERROR_CREATE_ONSCREEN,
200
200
                   "EGL platform only supports a single onscreen window");
201
201
      return FALSE;