From 596ff72dc9ccbb494404e37df93882d362295bec Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Feb 2012 11:19:20 +0800 Subject: [PATCH] Update cogl.symbols -Adapt to the removal of _EXP mangling from many of the experimental functions -Adapt to newly added/replaced APIs -_cogl_handle_atlas_texture_get_type is gone https://bugzilla.gnome.org/show_bug.cgi?id=669785 Reviewed-by: Neil Roberts --- cogl/cogl.symbols | 386 ++++++++++++++++++++++++---------------------- 1 file changed, 203 insertions(+), 183 deletions(-) diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols index 5910e8335..8e52e92c4 100644 --- a/cogl/cogl.symbols +++ b/cogl/cogl.symbols @@ -52,7 +52,7 @@ cogl_bitmap_get_size_from_file cogl_bitmap_new_from_file #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_bitmap_new_from_buffer_EXP +cogl_bitmap_new_from_buffer #endif cogl_blend_string_error_get_type @@ -61,20 +61,20 @@ cogl_buffer_access_get_type cogl_buffer_bit_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_buffer_get_size_EXP -cogl_buffer_get_update_hint_EXP +cogl_buffer_get_size +cogl_buffer_get_update_hint #if 0 ;not implemented! -cogl_buffer_get_usage_hint_EXP +cogl_buffer_get_usage_hint #endif -cogl_buffer_map_EXP +cogl_buffer_map #endif cogl_buffer_map_hint_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_buffer_set_data_EXP -cogl_buffer_set_update_hint_EXP +cogl_buffer_set_data +cogl_buffer_set_update_hint #if 0 ;not implemented! cogl_buffer_set_usage_hint_EXP @@ -84,7 +84,7 @@ cogl_buffer_set_usage_hint_EXP cogl_buffer_target_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_buffer_unmap_EXP +cogl_buffer_unmap #endif cogl_buffer_update_hint_get_type @@ -112,7 +112,7 @@ cogl_clip_push_rectangle cogl_clip_push_window_rect #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_clip_push_primitive_EXP +cogl_clip_push_primitive #endif #ifndef COGL_DISABLE_DEPRECATED @@ -170,11 +170,11 @@ cogl_color_unpremultiply #ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_HAS_EGL_SUPPORT -cogl_egl_context_get_egl_display_EXP +cogl_egl_context_get_egl_display #endif -cogl_context_get_display_EXP -cogl_context_new_EXP +cogl_context_get_display +cogl_context_new #endif cogl_create_program @@ -196,20 +196,15 @@ cogl_depth_test_function_get_type cogl_disable_fog #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_display_get_renderer_EXP -cogl_display_new_EXP -cogl_display_setup_EXP +cogl_display_get_renderer +cogl_display_new +cogl_display_setup #endif cogl_double_to_fixed cogl_double_to_int cogl_double_to_uint -#ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_draw_attributes -cogl_draw_indexed_attributes -#endif - cogl_end_gl cogl_error_get_type @@ -240,67 +235,72 @@ cogl_fixed_tan cogl_fog_mode_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_foreach_feature_EXP +cogl_foreach_feature #endif cogl_flush #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_framebuffer_add_swap_buffers_callback_EXP -cogl_framebuffer_allocate_EXP -cogl_framebuffer_clear4f_EXP -cogl_framebuffer_clear_EXP -cogl_framebuffer_discard_buffers_EXP -cogl_framebuffer_error_quark_EXP +cogl_framebuffer_add_swap_buffers_callback +cogl_framebuffer_allocate +cogl_framebuffer_clear4f +cogl_framebuffer_clear +cogl_framebuffer_discard_buffers +cogl_framebuffer_draw_attributes +cogl_framebuffer_draw_indexed_attributes +cogl_framebuffer_draw_primitive +cogl_framebuffer_error_quark cogl_framebuffer_finish -cogl_framebuffer_frustum_EXP -cogl_framebuffer_get_alpha_bits_EXP -cogl_framebuffer_get_blue_bits_EXP -cogl_framebuffer_get_color_format_EXP -cogl_framebuffer_get_color_mask_EXP -cogl_framebuffer_get_context_EXP +cogl_framebuffer_frustum +cogl_framebuffer_get_alpha_bits +cogl_framebuffer_get_blue_bits +cogl_framebuffer_get_color_format +cogl_framebuffer_get_color_mask +cogl_framebuffer_get_context cogl_framebuffer_get_dither_enabled -cogl_framebuffer_get_green_bits_EXP -cogl_framebuffer_get_height_EXP -cogl_framebuffer_get_modelview_matrix_EXP +cogl_framebuffer_get_green_bits +cogl_framebuffer_get_height +cogl_framebuffer_get_modelview_matrix cogl_framebuffer_get_projection_matrix -cogl_framebuffer_get_red_bits_EXP -cogl_framebuffer_get_samples_per_pixel_EXP -cogl_framebuffer_get_viewport4fv_EXP -cogl_framebuffer_get_viewport_height_EXP -cogl_framebuffer_get_viewport_width_EXP -cogl_framebuffer_get_viewport_x_EXP -cogl_framebuffer_get_viewport_y_EXP -cogl_framebuffer_get_width_EXP -cogl_framebuffer_identity_matrix_EXP -cogl_framebuffer_orthographic_EXP -cogl_framebuffer_perspective_EXP -cogl_framebuffer_pop_clip_EXP -cogl_framebuffer_pop_matrix_EXP -cogl_framebuffer_push_matrix_EXP -cogl_framebuffer_push_path_clip_EXP -cogl_framebuffer_push_primitive_clip_EXP -cogl_framebuffer_push_rectangle_clip_EXP -cogl_framebuffer_push_scissor_clip_EXP -cogl_framebuffer_remove_swap_buffers_callback_EXP -cogl_framebuffer_resolve_samples_EXP -cogl_framebuffer_resolve_samples_region_EXP -cogl_framebuffer_rotate_EXP -cogl_framebuffer_scale_EXP -cogl_framebuffer_set_color_mask_EXP +cogl_framebuffer_get_red_bits +cogl_framebuffer_get_samples_per_pixel +cogl_framebuffer_get_viewport4fv +cogl_framebuffer_get_viewport_height +cogl_framebuffer_get_viewport_width +cogl_framebuffer_get_viewport_x +cogl_framebuffer_get_viewport_y +cogl_framebuffer_get_width +cogl_framebuffer_identity_matrix +cogl_framebuffer_orthographic +cogl_framebuffer_perspective +cogl_framebuffer_pop_clip +cogl_framebuffer_pop_matrix +cogl_framebuffer_push_matrix +cogl_framebuffer_push_path_clip +cogl_framebuffer_push_primitive_clip +cogl_framebuffer_push_rectangle_clip +cogl_framebuffer_push_scissor_clip +cogl_framebuffer_remove_swap_buffers_callback +cogl_framebuffer_resolve_samples +cogl_framebuffer_resolve_samples_region +cogl_framebuffer_rotate +cogl_framebuffer_scale +cogl_framebuffer_set_color_mask cogl_framebuffer_set_dither_enabled -cogl_framebuffer_set_modelview_matrix_EXP +cogl_framebuffer_set_modelview_matrix cogl_framebuffer_set_projection_matrix -cogl_framebuffer_set_samples_per_pixel_EXP -cogl_framebuffer_set_viewport_EXP -cogl_framebuffer_swap_buffers_EXP -cogl_framebuffer_swap_region_EXP -cogl_framebuffer_transform_EXP -cogl_framebuffer_translate_EXP +cogl_framebuffer_set_samples_per_pixel +cogl_framebuffer_set_viewport +cogl_framebuffer_swap_buffers +cogl_framebuffer_swap_region +cogl_framebuffer_transform +cogl_framebuffer_translate +cogl_framebuffer_vdraw_attributes +cogl_framebuffer_vdraw_indexed_attributes #endif #ifdef COGL_HAS_EGL_PLATFORM_GDL_SUPPORT -cogl_gdl_display_set_plane_EXP +cogl_gdl_display_set_plane #endif cogl_frustum @@ -309,7 +309,7 @@ cogl_get_bitmasks cogl_get_depth_test_enabled #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_get_draw_framebuffer_EXP +cogl_get_draw_framebuffer #endif cogl_get_features @@ -332,6 +332,10 @@ cogl_get_static_zero_quaternion cogl_get_viewport +#ifdef COGL_HAS_GLIB_SUPPORT +cogl_glib_source_new +#endif + #ifdef _COGL_SUPPORTS_GTYPE_INTEGRATION cogl_gtype_matrix_get_type #endif @@ -341,8 +345,8 @@ cogl_handle_ref cogl_handle_unref #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_has_feature_EXP -cogl_has_features_EXP +cogl_has_feature +cogl_has_features cogl_index_buffer_new cogl_indices_get_buffer cogl_indices_get_offset @@ -362,7 +366,8 @@ cogl_is_attribute_buffer cogl_is_bitmap #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_is_buffer_EXP +cogl_is_buffer +cogl_is_context cogl_is_index_buffer #if 0 ;not implemented! @@ -375,7 +380,7 @@ cogl_is_offscreen cogl_is_path #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_is_pipeline_EXP +cogl_is_pipeline cogl_is_pixel_buffer_EXP cogl_is_primitive #endif @@ -383,13 +388,13 @@ cogl_is_primitive cogl_is_program #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_is_renderer_EXP +cogl_is_renderer #endif cogl_is_shader #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_is_snippet_EXP +cogl_is_snippet cogl_is_sub_texture_EXP #endif @@ -404,6 +409,12 @@ cogl_is_texture_3d_EXP cogl_is_vertex_buffer cogl_is_vertex_buffer_indices + +#ifdef COGL_HAS_EGL_PLATFORM_KMS_SUPPORT +cogl_kms_renderer_get_kms_fd +#endif + + cogl_material_alpha_func_get_type cogl_material_copy cogl_material_filter_get_type @@ -495,7 +506,7 @@ cogl_matrix_init_from_quaternion #endif cogl_matrix_init_identity -cogl_matrix_look_at_EXP +cogl_matrix_look_at cogl_matrix_multiply #ifndef COGL_DISABLE_DEPRECATED @@ -503,13 +514,13 @@ cogl_matrix_ortho #endif #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_matrix_orthographic_EXP +cogl_matrix_orthographic #endif cogl_matrix_perspective #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_matrix_project_points_EXP +cogl_matrix_project_points #endif cogl_matrix_rotate @@ -517,15 +528,15 @@ cogl_matrix_scale cogl_matrix_transform_point #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_matrix_transform_points_EXP +cogl_matrix_transform_points #endif cogl_matrix_translate cogl_matrix_transpose #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_matrix_view_2d_in_frustum_EXP -cogl_matrix_view_2d_in_perspective_EXP +cogl_matrix_view_2d_in_frustum +cogl_matrix_view_2d_in_perspective cogl_meta_texture_foreach_in_region #endif @@ -545,19 +556,20 @@ cogl_offscreen_unref #ifndef COGL_WINSYS_INTEGRATED cogl_onscreen_clutter_backend_set_size_CLUTTER #endif -cogl_onscreen_hide_EXP -cogl_onscreen_new_EXP -cogl_onscreen_set_swap_throttled_EXP -cogl_onscreen_show_EXP +cogl_onscreen_hide +cogl_onscreen_new +cogl_onscreen_set_swap_throttled +cogl_onscreen_show cogl_onscreen_template_new_EXP cogl_onscreen_template_set_samples_per_pixel +cogl_onscreen_template_set_swap_throttled #ifdef COGL_HAS_WIN32_SUPPORT -cogl_win32_onscreen_get_window_EXP -cogl_win32_onscreen_set_foreign_window_EXP +cogl_win32_onscreen_get_window +cogl_win32_onscreen_set_foreign_window #endif #ifdef COGL_HAS_X11 -cogl_x11_onscreen_get_visual_xid_EXP -cogl_x11_onscreen_set_foreign_window_xid_EXP +cogl_x11_onscreen_get_visual_xid +cogl_x11_onscreen_set_foreign_window_xid #endif #endif @@ -588,74 +600,75 @@ cogl_path_stroke_preserve ;this is COGL 1.0 API cogl_perspective #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_pipeline_add_layer_snippet_EXP -cogl_pipeline_add_snippet_EXP +cogl_pipeline_add_layer_snippet +cogl_pipeline_add_snippet #endif cogl_pipeline_cache_free cogl_pipeline_cache_new #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_pipeline_copy_EXP +cogl_pipeline_copy #endif #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_pipeline_foreach_layer_EXP -cogl_pipeline_get_alpha_test_function_EXP -cogl_pipeline_get_alpha_test_reference_EXP -cogl_pipeline_get_ambient_EXP -cogl_pipeline_get_color_EXP -cogl_pipeline_get_color_mask_EXP +cogl_pipeline_foreach_layer +cogl_pipeline_get_alpha_test_function +cogl_pipeline_get_alpha_test_reference +cogl_pipeline_get_ambient +cogl_pipeline_get_color +cogl_pipeline_get_color_mask cogl_pipeline_get_cull_face_mode -cogl_pipeline_get_depth_state_EXP -cogl_pipeline_get_diffuse_EXP -cogl_pipeline_get_emission_EXP +cogl_pipeline_get_depth_state +cogl_pipeline_get_diffuse +cogl_pipeline_get_emission cogl_pipeline_get_front_face_winding -cogl_pipeline_get_layer_point_sprite_coords_enabled_EXP -cogl_pipeline_get_layer_wrap_mode_p_EXP -cogl_pipeline_get_layer_wrap_mode_s_EXP -cogl_pipeline_get_layer_wrap_mode_t_EXP -cogl_pipeline_get_n_layers_EXP -cogl_pipeline_get_point_size_EXP -cogl_pipeline_get_shininess_EXP -cogl_pipeline_get_specular_EXP -cogl_pipeline_get_uniform_location_EXP -cogl_pipeline_get_user_program_EXP -cogl_pipeline_new_EXP -cogl_pipeline_set_alpha_test_function_EXP -cogl_pipeline_set_ambient_EXP -cogl_pipeline_set_ambient_and_diffuse_EXP -cogl_pipeline_set_blend_EXP -cogl_pipeline_set_blend_constant_EXP -cogl_pipeline_set_color_EXP -cogl_pipeline_set_color_mask_EXP -cogl_pipeline_set_color4f_EXP -cogl_pipeline_set_color4ub_EXP +cogl_pipeline_get_layer_point_sprite_coords_enabled +cogl_pipeline_get_layer_texture +cogl_pipeline_get_layer_wrap_mode_p +cogl_pipeline_get_layer_wrap_mode_s +cogl_pipeline_get_layer_wrap_mode_t +cogl_pipeline_get_n_layers +cogl_pipeline_get_point_size +cogl_pipeline_get_shininess +cogl_pipeline_get_specular +cogl_pipeline_get_uniform_location +cogl_pipeline_get_user_program +cogl_pipeline_new +cogl_pipeline_set_alpha_test_function +cogl_pipeline_set_ambient +cogl_pipeline_set_ambient_and_diffuse +cogl_pipeline_set_blend +cogl_pipeline_set_blend_constant +cogl_pipeline_set_color +cogl_pipeline_set_color_mask +cogl_pipeline_set_color4f +cogl_pipeline_set_color4ub cogl_pipeline_set_cull_face_mode -cogl_pipeline_set_depth_state_EXP -cogl_pipeline_set_diffuse_EXP -cogl_pipeline_set_emission_EXP +cogl_pipeline_set_depth_state +cogl_pipeline_set_diffuse +cogl_pipeline_set_emission cogl_pipeline_set_front_face_winding -cogl_pipeline_set_layer_combine_EXP -cogl_pipeline_set_layer_combine_constant_EXP -cogl_pipeline_set_layer_filters_EXP -cogl_pipeline_set_layer_matrix_EXP -cogl_pipeline_set_layer_point_sprite_coords_enabled_EXP -cogl_pipeline_set_layer_texture_EXP -cogl_pipeline_set_layer_wrap_mode_EXP -cogl_pipeline_set_layer_wrap_mode_p_EXP -cogl_pipeline_set_layer_wrap_mode_s_EXP -cogl_pipeline_set_layer_wrap_mode_t_EXP -cogl_pipeline_set_point_size_EXP -cogl_pipeline_remove_layer_EXP -cogl_pipeline_set_shininess_EXP -cogl_pipeline_set_specular_EXP -cogl_pipeline_set_uniform_float_EXP -cogl_pipeline_set_uniform_int_EXP -cogl_pipeline_set_uniform_matrix_EXP -cogl_pipeline_set_uniform_1f_EXP -cogl_pipeline_set_uniform_1i_EXP -cogl_pipeline_set_user_program_EXP +cogl_pipeline_set_layer_combine +cogl_pipeline_set_layer_combine_constant +cogl_pipeline_set_layer_filters +cogl_pipeline_set_layer_matrix +cogl_pipeline_set_layer_point_sprite_coords_enabled +cogl_pipeline_set_layer_texture +cogl_pipeline_set_layer_wrap_mode +cogl_pipeline_set_layer_wrap_mode_p +cogl_pipeline_set_layer_wrap_mode_s +cogl_pipeline_set_layer_wrap_mode_t +cogl_pipeline_set_point_size +cogl_pipeline_remove_layer +cogl_pipeline_set_shininess +cogl_pipeline_set_specular +cogl_pipeline_set_uniform_float +cogl_pipeline_set_uniform_int +cogl_pipeline_set_uniform_matrix +cogl_pipeline_set_uniform_1f +cogl_pipeline_set_uniform_1i +cogl_pipeline_set_user_program #endif #ifdef COGL_ENABLE_EXPERIMENTAL_API @@ -670,6 +683,9 @@ cogl_pixel_buffer_set_region_EXP #endif #endif +cogl_poll_dispatch +cogl_poll_get_info + cogl_pixel_format_get_type cogl_polygon @@ -682,8 +698,10 @@ cogl_pop_matrix cogl_pop_source #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_primitive_draw +cogl_primitive_copy +cogl_primitive_foreach_attribute cogl_primitive_get_first_vertex +cogl_primitive_get_indices cogl_primitive_get_mode cogl_primitive_get_n_vertices_EXP cogl_primitive_new @@ -764,18 +782,20 @@ cogl_rectangle_with_multitexture_coords cogl_rectangle_with_texture_coords #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_renderer_check_onscreen_template_EXP -cogl_renderer_connect_EXP -cogl_renderer_get_n_fragment_texture_units_EXP +cogl_renderer_add_constraint +cogl_renderer_check_onscreen_template +cogl_renderer_connect +cogl_renderer_get_n_fragment_texture_units #endif cogl_renderer_error_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_renderer_error_quark_EXP -cogl_renderer_get_winsys_id_EXP -cogl_renderer_new_EXP -cogl_renderer_set_winsys_id_EXP +cogl_renderer_error_quark +cogl_renderer_get_winsys_id +cogl_renderer_new +cogl_renderer_remove_constraint +cogl_renderer_set_winsys_id #endif cogl_rotate @@ -817,20 +837,22 @@ cogl_shader_unref cogl_shader_type_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_snippet_get_declarations_EXP -cogl_snippet_get_hook_EXP -cogl_snippet_get_post_EXP -cogl_snippet_get_pre_EXP -cogl_snippet_get_replace_EXP -cogl_snippet_new_EXP -cogl_snippet_set_declarations_EXP -cogl_snippet_set_post_EXP -cogl_snippet_set_pre_EXP -cogl_snippet_set_replace_EXP +cogl_snippet_get_declarations +cogl_snippet_get_hook +cogl_snippet_get_post +cogl_snippet_get_pre +cogl_snippet_get_replace +cogl_snippet_new +cogl_snippet_set_declarations +cogl_snippet_set_post +cogl_snippet_set_pre +cogl_snippet_set_replace #endif cogl_sqrti +cogl_sub_texture_get_parent + #ifdef COGL_ENABLE_EXPERIMENTAL_API cogl_sub_texture_new_EXP @@ -883,7 +905,7 @@ cogl_texture_unref cogl_texture_2d_new_from_data_EXP cogl_texture_2d_new_from_foreign_EXP cogl_texture_2d_new_with_size_EXP -cogl_texture_2d_sliced_new_with_size_EXP +cogl_texture_2d_sliced_new_with_size cogl_texture_3d_new_from_data_EXP cogl_texture_3d_new_with_size_EXP @@ -893,25 +915,22 @@ cogl_transform cogl_translate #ifdef COGL_ENABLE_EXPERIMENTAL_API -cogl_vdraw_attributes -cogl_vdraw_indexed_attributes - -cogl_vector3_add_EXP -cogl_vector3_copy_EXP -cogl_vector3_cross_product_EXP -cogl_vector3_distance_EXP -cogl_vector3_divide_scalar_EXP -cogl_vector3_dot_product_EXP -cogl_vector3_equal_EXP -cogl_vector3_equal_with_epsilon_EXP -cogl_vector3_free_EXP -cogl_vector3_init_EXP -cogl_vector3_init_zero_EXP -cogl_vector3_invert_EXP -cogl_vector3_magnitude_EXP -cogl_vector3_multiply_scalar_EXP -cogl_vector3_normalize_EXP -cogl_vector3_subtract_EXP +cogl_vector3_add +cogl_vector3_copy +cogl_vector3_cross_product +cogl_vector3_distance +cogl_vector3_divide_scalar +cogl_vector3_dot_product +cogl_vector3_equal +cogl_vector3_equal_with_epsilon +cogl_vector3_free +cogl_vector3_init +cogl_vector3_init_zero +cogl_vector3_invert +cogl_vector3_magnitude +cogl_vector3_multiply_scalar +cogl_vector3_normalize +cogl_vector3_subtract #endif cogl_vertex_buffer_add @@ -946,6 +965,7 @@ cogl_winsys_feature_get_type #ifdef COGL_ENABLE_EXPERIMENTAL_API #ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT +cogl_wayland_onscreen_resize cogl_wayland_renderer_get_compositor_EXP cogl_wayland_renderer_get_display_EXP cogl_wayland_texture_2d_new_from_buffer_EXP @@ -965,6 +985,7 @@ cogl_xlib_renderer_get_display_EXP cogl_xlib_renderer_get_foreign_display_EXP cogl_xlib_renderer_handle_event_EXP cogl_xlib_renderer_remove_filter_EXP +cogl_xlib_renderer_set_event_retrieval_enabled cogl_xlib_renderer_set_foreign_display_EXP cogl_xlib_set_display_EXP #endif @@ -986,7 +1007,6 @@ _cogl_atlas_texture_new_with_size _cogl_atlas_texture_remove_reorganize_callback _cogl_context_get_default _cogl_error_quark -_cogl_handle_atlas_texture_get_type _cogl_texture_associate_framebuffer _cogl_texture_can_hardware_repeat _cogl_texture_determine_internal_format