From 789d7fafca01e45fec9042ecb162c93d7ff5380c Mon Sep 17 00:00:00 2001 From: Ali Sabil Date: Wed, 31 Mar 2010 09:13:21 +0200 Subject: [PATCH] cogl-1.0: update to 1.2.4 --- vapi/cogl-1.0.vapi | 94 +++- vapi/packages/cogl-1.0/cogl-1.0-custom.vala | 28 +- vapi/packages/cogl-1.0/cogl-1.0.gi | 448 ++++++++++++++++---- vapi/packages/cogl-1.0/cogl-1.0.metadata | 53 ++- 4 files changed, 526 insertions(+), 97 deletions(-) diff --git a/vapi/cogl-1.0.vapi b/vapi/cogl-1.0.vapi index 06ffe0485..1015fbaf5 100644 --- a/vapi/cogl-1.0.vapi +++ b/vapi/cogl-1.0.vapi @@ -9,12 +9,30 @@ namespace Cogl { public static Cogl.Bitmap new_from_file (string filename) throws GLib.Error; } [Compact] + [CCode (cname = "CoglHandle", cheader_filename = "cogl/cogl.h")] + public class Buffer : Cogl.Handle { + public uint get_size (); + public Cogl.BufferUpdateHint get_update_hint (); + public Cogl.BufferUsageHint get_usage_hint (); + public uchar map (Cogl.BufferAccess access); + public bool set_data (size_t offset, uchar data, size_t size); + public void set_update_hint (Cogl.BufferUpdateHint hint); + public void set_usage_hint (Cogl.BufferUsageHint hint); + public void unmap (); + } + [Compact] [CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref", cheader_filename = "cogl/cogl.h")] public class Handle { + [CCode (cname = "cogl_is_bitmap")] + public bool is_bitmap (); + [CCode (cname = "cogl_is_buffer")] + public bool is_buffer (); [CCode (cname = "cogl_is_material")] public bool is_material (); [CCode (cname = "cogl_is_offscreen")] public bool is_offscreen (); + [CCode (cname = "cogl_is_pixel_buffer")] + public bool is_pixel_buffer (); [CCode (cname = "cogl_is_program")] public bool is_program (); [CCode (cname = "cogl_is_shader")] @@ -29,6 +47,7 @@ namespace Cogl { public class Material : Cogl.Handle { [CCode (has_construct_function = false)] public Material (); + public Cogl.Material copy (); public void get_ambient (out Cogl.Color ambient); public void get_color (out Cogl.Color color); public void get_diffuse (out Cogl.Color diffuse); @@ -96,6 +115,12 @@ namespace Cogl { public class PangoRendererClass { } [Compact] + [CCode (cheader_filename = "cogl/cogl.h")] + public class PixelBuffer : Cogl.Handle { + public PixelBuffer (uint size); + public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride); + } + [Compact] [CCode (ref_function = "cogl_program_ref", unref_function = "cogl_program_unref", cname = "CoglHandle", cheader_filename = "cogl/cogl.h")] public class Program : Cogl.Handle { [CCode (cname = "cogl_create_program", has_construct_function = false)] @@ -226,9 +251,14 @@ namespace Cogl { public float yw; public float zw; public float ww; + [CCode (array_length = false)] + public weak float[] inv; + public uint type; + public uint flags; public Matrix.from_array (float[] array); public void frustum (float left, float right, float bottom, float top, float z_near, float z_far); public unowned float[] get_array (); + public bool get_inverse (Cogl.Matrix inverse); public Matrix.identity (); [CCode (cname = "cogl_matrix_multiply")] public Matrix.multiply (Cogl.Matrix a, Cogl.Matrix b); @@ -256,6 +286,13 @@ namespace Cogl { UNSIGNED_SHORT, FLOAT } + [CCode (cprefix = "COGL_BUFFER_ACCESS_", cheader_filename = "cogl/cogl.h")] + [Flags] + public enum BufferAccess { + READ, + WRITE, + READ_WRITE + } [CCode (cprefix = "COGL_BUFFER_BIT_", cheader_filename = "cogl/cogl.h")] [Flags] public enum BufferBit { @@ -269,13 +306,20 @@ namespace Cogl { WINDOW_BUFFER, OFFSCREEN_BUFFER } + [CCode (cprefix = "COGL_BUFFER_UPDATE_HINT_", cheader_filename = "cogl/cogl.h")] + public enum BufferUpdateHint { + STATIC, + DYNAMIC, + STREAM + } + [CCode (cprefix = "COGL_BUFFER_USAGE_HINT_", cheader_filename = "cogl/cogl.h")] + public enum BufferUsageHint { + TEXTURE + } [CCode (cprefix = "COGL_DEBUG_", cheader_filename = "cogl/cogl.h")] [Flags] public enum DebugFlags { - MISC, - TEXTURE, - MATERIAL, - SHADER, + SLICING, OFFSCREEN, DRAW, PANGO, @@ -283,11 +327,21 @@ namespace Cogl { HANDLE, BLEND_STRINGS, DISABLE_BATCHING, - FORCE_CLIENT_SIDE_MATRICES, DISABLE_VBOS, JOURNAL, BATCHING, - DISABLE_SOFTWARE_TRANSFORM + DISABLE_SOFTWARE_TRANSFORM, + MATRICES, + FORCE_SCANLINE_PATHS, + ATLAS, + DUMP_ATLAS_IMAGE, + DISABLE_ATLAS, + OPENGL + } + [CCode (cprefix = "COGL_DRIVER_ERROR_", cheader_filename = "cogl/cogl.h")] + public enum DriverError { + UNKNOWN_VERSION, + INVALID_VERSION } [CCode (cprefix = "COGL_FEATURE_", cheader_filename = "cogl/cogl.h")] [Flags] @@ -302,7 +356,9 @@ namespace Cogl { OFFSCREEN_BLIT, FOUR_CLIP_PLANES, STENCIL_BUFFER, - VBOS + VBOS, + PBOS, + UNSIGNED_INT_INDICES } [CCode (cprefix = "COGL_FOG_MODE_", cheader_filename = "cogl/cogl.h")] public enum FogMode { @@ -313,7 +369,8 @@ namespace Cogl { [CCode (cprefix = "COGL_INDICES_TYPE_UNSIGNED_", cheader_filename = "cogl/cogl.h")] public enum IndicesType { BYTE, - SHORT + SHORT, + INT } [CCode (cprefix = "COGL_MATERIAL_ALPHA_FUNC_", cheader_filename = "cogl/cogl.h")] public enum MaterialAlphaFunc { @@ -376,7 +433,8 @@ namespace Cogl { public enum TextureFlags { NONE, NO_AUTO_MIPMAP, - NO_SLICING + NO_SLICING, + NO_ATLAS } [CCode (cprefix = "COGL_VERTICES_MODE_", cheader_filename = "cogl/cogl.h")] public enum VerticesMode { @@ -404,6 +462,8 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public const int BGR_BIT; [CCode (cheader_filename = "cogl/cogl.h")] + public const int CLUTTER_COGL_HAS_GL; + [CCode (cheader_filename = "cogl/cogl.h")] public const int FIXED_0_5; [CCode (cheader_filename = "cogl/cogl.h")] public const int FIXED_1; @@ -426,6 +486,8 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public const int FIXED_Q; [CCode (cheader_filename = "cogl/cogl.h")] + public const int HAS_GL; + [CCode (cheader_filename = "cogl/cogl.h")] public const int PIXEL_FORMAT_24; [CCode (cheader_filename = "cogl/cogl.h")] public const int PIXEL_FORMAT_32; @@ -450,7 +512,7 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public static bool check_extension (string name, string ext); [CCode (cheader_filename = "cogl/cogl.h")] - public static void clear (Cogl.Color color, ulong buffers); + public static void clear (Cogl.Color color, uint buffers); [CCode (cheader_filename = "cogl/cogl.h")] public static void clip_ensure (); [CCode (cheader_filename = "cogl/cogl.h")] @@ -462,8 +524,12 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public static void clip_push_from_path_preserve (); [CCode (cheader_filename = "cogl/cogl.h")] + public static void clip_push_rectangle (float x0, float y0, float x1, float y1); + [CCode (cheader_filename = "cogl/cogl.h")] public static void clip_push_window_rect (float x_offset, float y_offset, float width, float height); [CCode (cheader_filename = "cogl/cogl.h")] + public static void clip_push_window_rectangle (int x_offset, int y_offset, int width, int height); + [CCode (cheader_filename = "cogl/cogl.h")] public static void clip_stack_restore (); [CCode (cheader_filename = "cogl/cogl.h")] public static void clip_stack_save (); @@ -554,8 +620,12 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public static void polygon (Cogl.TextureVertex[] vertices, bool use_color); [CCode (cheader_filename = "cogl/cogl.h")] + public static void pop_framebuffer (); + [CCode (cheader_filename = "cogl/cogl.h")] public static void pop_matrix (); [CCode (cheader_filename = "cogl/cogl.h")] + public static void push_framebuffer (Cogl.Bitmap buffer); + [CCode (cheader_filename = "cogl/cogl.h")] public static void push_matrix (); [CCode (cheader_filename = "cogl/cogl.h")] public static void read_pixels (int x, int y, int width, int height, Cogl.ReadPixelsFlags source, Cogl.PixelFormat format, uchar pixels); @@ -580,6 +650,8 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public static void set_fog (Cogl.Color fog_color, Cogl.FogMode mode, float density, float z_near, float z_far); [CCode (cheader_filename = "cogl/cogl.h")] + public static void set_framebuffer (Cogl.Bitmap buffer); + [CCode (cheader_filename = "cogl/cogl.h")] public static void set_modelview_matrix (Cogl.Matrix matrix); [CCode (cheader_filename = "cogl/cogl.h")] public static void set_projection_matrix (Cogl.Matrix matrix); @@ -594,6 +666,8 @@ namespace Cogl { [CCode (cheader_filename = "cogl/cogl.h")] public static void set_source_texture (Cogl.Texture texture_handle); [CCode (cheader_filename = "cogl/cogl.h")] + public static void set_viewport (int x, int y, int width, int height); + [CCode (cheader_filename = "cogl/cogl.h")] public static int sqrti (int x); [CCode (cheader_filename = "cogl/cogl.h")] public static void translate (float x, float y, float z); diff --git a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala index e2d05a3b0..be78ad8d6 100644 --- a/vapi/packages/cogl-1.0/cogl-1.0-custom.vala +++ b/vapi/packages/cogl-1.0/cogl-1.0-custom.vala @@ -7,13 +7,32 @@ namespace Cogl { public static Bitmap new_from_file (string filename) throws GLib.Error; } + [Compact] + [CCode (cname = "CoglHandle")] + public class Buffer: Handle { + public uint get_size (); + public Cogl.BufferUpdateHint get_update_hint (); + public Cogl.BufferUsageHint get_usage_hint (); + public uchar map (Cogl.BufferAccess access); + public bool set_data (size_t offset, uchar data, size_t size); + public void set_update_hint (Cogl.BufferUpdateHint hint); + public void set_usage_hint (Cogl.BufferUsageHint hint); + public void unmap (); + } + [Compact] [CCode (ref_function = "cogl_handle_ref", unref_function = "cogl_handle_unref")] public class Handle { + [CCode (cname = "cogl_is_bitmap")] + public bool is_bitmap (); + [CCode (cname = "cogl_is_buffer")] + public bool is_buffer (); [CCode (cname = "cogl_is_material")] public bool is_material (); [CCode (cname = "cogl_is_offscreen")] public bool is_offscreen (); + [CCode (cname = "cogl_is_pixel_buffer")] + public bool is_pixel_buffer (); [CCode (cname = "cogl_is_program")] public bool is_program (); [CCode (cname = "cogl_is_shader")] @@ -29,6 +48,8 @@ namespace Cogl { public class Material: Handle { [CCode (type = "CoglHandle*", has_construct_function = false)] public Material (); + public Material copy(); + public void get_ambient (out Cogl.Color ambient); public void get_color (out Cogl.Color color); public void get_diffuse (out Cogl.Color diffuse); @@ -80,6 +101,12 @@ namespace Cogl { public static void push_draw_buffer (); } + [Compact] + public class PixelBuffer: Handle { + public PixelBuffer (uint size); + public PixelBuffer.for_size (uint width, uint height, Cogl.PixelFormat format, uint stride); + } + [Compact] [CCode (cname = "CoglHandle", ref_function = "cogl_program_ref", unref_function = "cogl_program_unref")] public class Program: Handle { @@ -106,7 +133,6 @@ namespace Cogl { public Cogl.ShaderType get_type (); public bool is_compiled (); public void source (string source); - } [Compact] diff --git a/vapi/packages/cogl-1.0/cogl-1.0.gi b/vapi/packages/cogl-1.0/cogl-1.0.gi index 634b9d572..8fbd230f0 100644 --- a/vapi/packages/cogl-1.0/cogl-1.0.gi +++ b/vapi/packages/cogl-1.0/cogl-1.0.gi @@ -7,33 +7,141 @@ - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + @@ -57,6 +165,15 @@ + + + + + + + + + @@ -66,6 +183,15 @@ + + + + + + + + + @@ -91,13 +217,13 @@ - + - + @@ -131,10 +257,10 @@ - - - - + + + + @@ -155,7 +281,7 @@ - + @@ -170,6 +296,24 @@ + + + + + + + + + + + + + + + + + + @@ -182,6 +326,18 @@ + + + + + + + + + + + + @@ -206,6 +362,12 @@ + + + + + + @@ -262,25 +424,25 @@ - + - + - + - + @@ -296,7 +458,7 @@ - + @@ -389,7 +551,7 @@ - + @@ -405,8 +567,8 @@ - - + + @@ -573,14 +735,14 @@ - + - + @@ -643,17 +805,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + @@ -740,6 +935,12 @@ + + + + + + @@ -772,7 +973,7 @@ - + @@ -792,14 +993,14 @@ - + - + @@ -848,6 +1049,12 @@ + + + + + + @@ -896,6 +1103,15 @@ + + + + + + + + + @@ -903,7 +1119,7 @@ - + @@ -930,7 +1146,7 @@ - + @@ -940,18 +1156,18 @@ - + - + - + - - + + @@ -960,26 +1176,34 @@ + + + + + + + + - + - + - + - + @@ -1001,29 +1225,51 @@ - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -1038,17 +1284,17 @@ - - - - - - - - + + + + + + + + - - + + @@ -1120,7 +1366,7 @@ - + @@ -1128,7 +1374,7 @@ - + @@ -1148,7 +1394,7 @@ - + @@ -1172,8 +1418,8 @@ - - + + @@ -1358,7 +1604,7 @@ - + @@ -1377,14 +1623,14 @@ - + - + - + @@ -1441,6 +1687,13 @@ + + + + + + + @@ -1538,10 +1791,10 @@ - - - - + + + + @@ -1611,6 +1864,18 @@ + + + + + + + + + + + + @@ -1619,6 +1884,7 @@ + @@ -1675,6 +1941,11 @@ + + + + + @@ -1685,22 +1956,24 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -1714,6 +1987,8 @@ + + @@ -1722,9 +1997,11 @@ + + @@ -1739,6 +2016,7 @@ + diff --git a/vapi/packages/cogl-1.0/cogl-1.0.metadata b/vapi/packages/cogl-1.0/cogl-1.0.metadata index ce9062a21..e5ab1f271 100644 --- a/vapi/packages/cogl-1.0/cogl-1.0.metadata +++ b/vapi/packages/cogl-1.0/cogl-1.0.metadata @@ -9,6 +9,8 @@ GLuint name="ulong" GLvoid name="void" GLsizei name="size_t" +cogl_*_EXP hidden="1" + CoglAngle is_value_type="1" CoglBlendStringError errordomain="1" @@ -25,8 +27,11 @@ cogl_create_shader hidden="1" CoglFixed is_value_type="1" +cogl_is_bitmap hidden="1" +cogl_is_buffer hidden="1" cogl_is_material hidden="1" cogl_is_offscreen hidden="1" +cogl_is_pixel_buffer hidden="1" cogl_is_program hidden="1" cogl_is_shader hidden="1" cogl_is_texture hidden="1" @@ -41,6 +46,9 @@ cogl_matrix_init_identity hidden="1" cogl_pop_draw_buffer hidden="1" cogl_push_draw_buffer hidden="1" +cogl_pixel_buffer_new hidden="1" +cogl_pixel_buffer_new_for_size hidden="1" + cogl_program_* hidden="1" cogl_rectangles.verts is_array="1" no_array_length="1" @@ -50,13 +58,56 @@ cogl_set_draw_buffer hidden="1" cogl_set_source.material type_name="Material" cogl_set_source_texture.texture_handle type_name="Texture" +cogl_buffer_get_size hidden="1" +cogl_buffer_get_update_hint hidden="1" +cogl_buffer_get_usage_hint hidden="1" +cogl_buffer_map hidden="1" +cogl_buffer_set_data hidden="1" +cogl_buffer_set_update_hint hidden="1" +cogl_buffer_set_usage_hint hidden="1" +cogl_buffer_unmap hidden="1" + cogl_shader_* hidden="1" cogl_texture_* hidden="1" CoglTextureVertex is_value_type="1" -cogl_material_* hidden="1" +cogl_material_new hidden="1" +cogl_material_ref hidden="1" +cogl_material_unref hidden="1" +cogl_material_copy hidden="1" +cogl_material_get_ambient hidden="1" +cogl_material_get_color hidden="1" +cogl_material_get_diffuse hidden="1" +cogl_material_get_emission hidden="1" +cogl_material_get_layers hidden="1" +cogl_material_get_n_layers hidden="1" +cogl_material_get_shininess hidden="1" +cogl_material_get_specular hidden="1" +cogl_material_remove_layer hidden="1" +cogl_material_set_alpha_test_function hidden="1" +cogl_material_set_ambient hidden="1" +cogl_material_set_ambient_and_diffuse hidden="1" +cogl_material_set_blend hidden="1" +cogl_material_set_blend_constant hidden="1" +cogl_material_set_color hidden="1" +cogl_material_set_color4f hidden="1" +cogl_material_set_color4ub hidden="1" +cogl_material_set_diffuse hidden="1" +cogl_material_set_emission hidden="1" +cogl_material_set_layer hidden="1" +cogl_material_set_layer_combine hidden="1" +cogl_material_set_layer_combine_constant hidden="1" +cogl_material_set_layer_filters hidden="1" +cogl_material_set_layer_matrix hidden="1" +cogl_material_set_shininess hidden="1" +cogl_material_set_specular hidden="1" + +cogl_material_layer_get_mag_filter hidden="1" +cogl_material_layer_get_min_filter hidden="1" +cogl_material_layer_get_texture hidden="1" +cogl_material_layer_get_type hidden="1" cogl_offscreen_* hidden="1" -- 2.47.2