diff --git a/cogl/cogl/cogl-clip-stack.c b/cogl/cogl/cogl-clip-stack.c index a0023c66c..067f7d36b 100644 --- a/cogl/cogl/cogl-clip-stack.c +++ b/cogl/cogl/cogl-clip-stack.c @@ -47,6 +47,7 @@ #include "cogl/cogl1-context.h" #include "cogl/cogl-offscreen.h" #include "cogl/cogl-matrix-stack.h" +#include "mtk/mtk.h" static void * _cogl_clip_stack_push_entry (CoglClipStack *clip_stack, @@ -276,7 +277,7 @@ cogl_clip_stack_push_region (CoglClipStack *stack, { CoglClipStack *entry; CoglClipStackRegion *entry_region; - cairo_rectangle_int_t bounds; + MtkRectangle bounds; entry_region = _cogl_clip_stack_push_entry (stack, sizeof (CoglClipStackRegion), diff --git a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c index ff8f0e1d7..e3f666c5f 100644 --- a/cogl/cogl/driver/gl/cogl-clip-stack-gl.c +++ b/cogl/cogl/driver/gl/cogl-clip-stack-gl.c @@ -32,6 +32,7 @@ * Robert Bragg */ + #include "cogl-config.h" #include "cogl/cogl-context-private.h" @@ -41,6 +42,7 @@ #include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-clip-stack-gl-private.h" +#include "mtk/mtk.h" static void add_stencil_clip_rectangle (CoglFramebuffer *framebuffer, @@ -182,7 +184,7 @@ add_stencil_clip_region (CoglFramebuffer *framebuffer, for (i = 0; i < num_rectangles; i++) { - cairo_rectangle_int_t rect; + MtkRectangle rect; float x1, y1, z1, w1; float x2, y2, z2, w2; CoglVertexP2 *v = vertices + i * 6; diff --git a/cogl/meson.build b/cogl/meson.build index 165a0d8e1..7668c98e7 100644 --- a/cogl/meson.build +++ b/cogl/meson.build @@ -2,7 +2,7 @@ cogl_includesubdir = pkgname / 'cogl' cogl_includedir = includedir / cogl_includesubdir cogl_srcdir = meson.current_source_dir() -cogl_includepath = include_directories('.', 'cogl') +cogl_includepath = [mtk_includepath, include_directories('.', 'cogl')] cdata = configuration_data() cdata.set('HAVE_COGL_GL', have_gl) @@ -26,6 +26,7 @@ cogl_pkg_private_deps = [ cairo_dep, gmodule_no_export_dep, gdk_pixbuf_dep, + libmutter_mtk_dep, #uprof_dep, ]