elementary/gala
1
1
Fork 0
mirror of https://github.com/elementary/gala.git synced 2024-12-24 01:36:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

cogl: Sanitize the .vapi dependencies (#746)

Browse Source 
* cogl: Remove cogl-fixes when mutter-cogl is now enough

* Remove compat.vapi

This is not used anymore
This commit is contained in:
Corentin Noël 2020-03-12 11:34:34 +01:00 committed by GitHub
parent 3b4700d3e7
commit 6e3d6a5190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -93,8 +93,6 @@ granite_dep = dependency('granite', version: '>= 5.3.0')
gnome_desktop_dep = dependency('gnome-desktop-3.0') gnome_desktop_dep = dependency('gnome-desktop-3.0')
gsd_dep = dependency('gnome-settings-daemon', version: '>= @0@'.format(gsd_version_required)) gsd_dep = dependency('gnome-settings-daemon', version: '>= @0@'.format(gsd_version_required))
m_dep = cc.find_library('m', required: false) m_dep = cc.find_library('m', required: false)
cogl_fixes_dep = vala.find_library('cogl-fixes', dirs: vapi_dir)
compat_dep = vala.find_library('compat', dirs: vapi_dir)
mutter_dep = [] mutter_dep = []
libmutter_dep = [] libmutter_dep = []
@ -174,7 +172,7 @@ mutter_typelib_dir = libmutter_dep.get_pkgconfig_variable('typelibdir')
add_project_arguments(vala_flags, language: 'vala') add_project_arguments(vala_flags, language: 'vala')
add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c') add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c')
gala_base_dep = [glib_dep, gobject_dep, gio_dep, gmodule_dep, gee_dep, gtk_dep, plank_dep, bamf_dep, mutter_dep, granite_dep, gnome_desktop_dep, m_dep, config_dep, cogl_fixes_dep, compat_dep] gala_base_dep = [glib_dep, gobject_dep, gio_dep, gmodule_dep, gee_dep, gtk_dep, plank_dep, bamf_dep, mutter_dep, granite_dep, gnome_desktop_dep, m_dep, config_dep]
subdir('data') subdir('data')
subdir('lib') subdir('lib')

2
src/DBus.vala
View File

@ -145,7 +145,7 @@ namespace Gala {
var texture = (Cogl.Texture)effect.get_texture (); var texture = (Cogl.Texture)effect.get_texture ();
var pixels = new uint8[texture.get_width () * texture.get_height () * 4]; var pixels = new uint8[texture.get_width () * texture.get_height () * 4];
CoglFixes.texture_get_data (texture, Cogl.PixelFormat.BGRA_8888_PRE, 0, pixels); texture.get_data (Cogl.PixelFormat.BGRA_8888_PRE, 0, pixels);
int size = width * height; int size = width * height;

2
src/ScreenshotManager.vala
View File

@ -324,7 +324,7 @@ namespace Gala {
int height = (int)texture.get_height (); int height = (int)texture.get_height ();
uint8[] data = new uint8[width * height * 4]; uint8[] data = new uint8[width * height * 4];
CoglFixes.texture_get_data (texture, Cogl.PixelFormat.RGBA_8888, 0, data); texture.get_data (Cogl.PixelFormat.RGBA_8888, 0, data);
var cursor_image = new Cairo.ImageSurface.for_data (data, Cairo.Format.ARGB32, width, height, width * 4); var cursor_image = new Cairo.ImageSurface.for_data (data, Cairo.Format.ARGB32, width, height, width * 4);
var target = new Cairo.ImageSurface (Cairo.Format.ARGB32, image_rect.width, image_rect.height); var target = new Cairo.ImageSurface (Cairo.Format.ARGB32, image_rect.width, image_rect.height);

6
vapi/cogl-fixes.vapi
View File

@ -1,6 +0,0 @@
namespace CoglFixes
{
[CCode (cname = "cogl_texture_get_data")]
public int texture_get_data (Cogl.Texture texture, Cogl.PixelFormat format, uint rowstride, [CCode (array_length = false)] uint8[] pixels);
}

21
vapi/compat.vapi
View File

@ -1,21 +0,0 @@
namespace Cogl
{
[CCode (cheader_filename = "cogl/cogl.h")]
public class Context : Cogl.Handle {
}
[CCode (cname = "cogl_bitmap_new_for_data")]
public static Cogl.Bitmap bitmap_new_for_data (Cogl.Context Context, int width, int height, Cogl.PixelFormat format, int rowstride, [CCode (array_length = false)] uchar[] data);
[CCode (cname = "cogl_get_draw_framebuffer")]
public static unowned Cogl.Framebuffer get_draw_framebuffer ();
[CCode (cname = "cogl_framebuffer_read_pixels_into_bitmap")]
public static Cogl.Bool framebuffer_read_pixels_into_bitmap (Cogl.Framebuffer framebuffer, int x, int y, Cogl.ReadPixelsFlags source, Cogl.Bitmap bitmap);
}
namespace Clutter
{
[CCode (cname = "clutter_backend_get_cogl_context")]
public static unowned Cogl.Context backend_get_cogl_context (Clutter.Backend backend);
}