AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

mir: fix build failures

Browse Source
This commit is contained in:
William Hua 2016-12-05 10:28:34 -05:00
parent e27e8e6e1c
commit 32b3928eda
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gdk/mir/gdkmirdisplay.c
View File

@ -691,7 +691,7 @@ gdk_mir_display_make_gl_context_current (GdkDisplay *display,
mir_context = GDK_MIR_GL_CONTEXT (context);
window = gdk_gl_context_get_window (context);
if (mir_context->is_attached || gdk_gl_context_is_drawing (context))
if (mir_context->is_attached || gdk_draw_context_is_drawing (context))
{
egl_surface = _gdk_mir_window_get_egl_surface (window,
mir_context->egl_config);

25
gdk/mir/gdkmirglcontext.c
View File

@ -103,7 +103,7 @@ gdk_mir_gl_context_get_damage (GdkGLContext *context)
GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
EGLSurface egl_surface;
GdkWindow *window = gdk_draw_context_get_window (GDK_DRAW_CONTEXT (context));
unsigned int buffer_age = 0;
int buffer_age = 0;
if (_gdk_mir_display_have_egl_buffer_age (display))
{
@ -141,22 +141,22 @@ gdk_mir_gl_context_get_damage (GdkGLContext *context)
}
static void
gdk_mir_gl_context_end_frame (GdkGLContext *context,
gdk_mir_gl_context_end_frame (GdkDrawContext *context,
cairo_region_t *painted,
cairo_region_t *damage)
{
GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
GdkWindow *window = gdk_gl_context_get_window (context);
GdkGLContext *gl_context = GDK_GL_CONTEXT (context);
GdkMirGLContext *context_mir = GDK_MIR_GL_CONTEXT (gl_context);
GdkWindow *window = gdk_gl_context_get_window (gl_context);
GdkDisplay *display = gdk_window_get_display (window);
GdkMirGLContext *context_mir = GDK_MIR_GL_CONTEXT (context);
EGLDisplay egl_display = _gdk_mir_display_get_egl_display (display);
EGLSurface egl_surface;
GDK_DRAW_CONTEXT_CLASS (gdk_x11_gl_context_parent_class)->end_frame (draw_context, painted, damage);
if (gdk_gl_context_get_shared_context (context))
GDK_DRAW_CONTEXT_CLASS (gdk_mir_gl_context_parent_class)->end_frame (context, painted, damage);
if (gdk_gl_context_get_shared_context (gl_context))
return;
gdk_gl_context_make_current (context);
gdk_gl_context_make_current (gl_context);
egl_surface = _gdk_mir_window_get_egl_surface (window,
context_mir->egl_config);
@ -212,12 +212,13 @@ gdk_mir_gl_context_dispose (GObject *gobject)
static void
gdk_mir_gl_context_class_init (GdkMirGLContextClass *klass)
{
GdkGLContextClass *context_class = GDK_GL_CONTEXT_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);
GdkGLContextClass *gl_context_class = GDK_GL_CONTEXT_CLASS (klass);
context_class->realize = gdk_mir_gl_context_realize;
context_class->get_damage = gdk_mir_gl_context_get_damage;
context_class->end_frame = gdk_mir_gl_context_end_frame;
gl_context_class->realize = gdk_mir_gl_context_realize;
gl_context_class->get_damage = gdk_mir_gl_context_get_damage;
draw_context_class->end_frame = gdk_mir_gl_context_end_frame;
gobject_class->dispose = gdk_mir_gl_context_dispose;
}

2
gdk/mir/gdkmirwindowimpl.c
View File

@ -974,11 +974,13 @@ gdk_mir_window_impl_begin_paint (GdkWindow *window)
static void
gdk_mir_window_impl_end_paint (GdkWindow *window)
{
#if 0
GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
//g_printerr ("gdk_mir_window_impl_end_paint window=%p\n", window);
if (impl->visible && !window->current_paint.use_gl)
send_buffer (window);
#endif
}
static cairo_region_t *