[cogl/cogl-1.12] Update/fix cogl.symbols for 1.12
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/cogl-1.12] Update/fix cogl.symbols for 1.12
- Date: Thu, 16 Aug 2012 17:21:53 +0000 (UTC)
commit 55e43947800421646b9b61fbdcdae0d2be7f5975
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Aug 16 23:56:06 2012 +0800
Update/fix cogl.symbols for 1.12
Update the cogl.symbols file for the 1.12 series, where symbols
were added for the following commits:
010d16f6: Adds initial GLES2 integration support
6eb88648: Add a cogl_matrix_init_from_euler function
5e8ff248: Add functions to directly transform from a euler or a quaternion
1686e754: bitmap: Adds cogl_android_bitmap_new_from_asset()
df515741: onscreen: Adds support for resizable windows
e347135b: Move cogl_wayland_display_ proto to cogl-wayland-server.h
Plus, when we branched out for 1.12, some needed symbols were missing, so
we would need to make up for them, in particular those in cogl-shader.h
and cogl-path-functions.h.
Reviewed-by: Robert Bragg <robert linux intel com>
cogl/cogl.symbols | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 4 deletions(-)
---
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index b950437..eddd423 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -155,6 +155,9 @@ cogl_egl_context_get_egl_display
cogl_context_get_display
cogl_context_new
+cogl_create_program
+cogl_create_shader
+
cogl_depth_state_get_range
cogl_depth_state_get_test_enabled
cogl_depth_state_get_test_function
@@ -253,6 +256,12 @@ cogl_framebuffer_read_pixels_into_bitmap
cogl_framebuffer_resolve_samples
cogl_framebuffer_resolve_samples_region
cogl_framebuffer_rotate
+
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_framebuffer_rotate_euler
+cogl_framebuffer_rotate_quaternion
+#endif
+
cogl_framebuffer_scale
cogl_framebuffer_set_color_mask
cogl_framebuffer_set_dither_enabled
@@ -279,6 +288,7 @@ cogl_get_draw_framebuffer
cogl_get_features
cogl_get_modelview_matrix
cogl_get_option_group
+cogl_get_path
cogl_get_proc_address
cogl_get_projection_matrix
cogl_get_rectangle_indices
@@ -287,6 +297,12 @@ cogl_get_static_identity_quaternion
cogl_get_static_zero_quaternion
cogl_get_viewport
+cogl_gles2_context_get_vtable
+cogl_gles2_context_new
+cogl_gles2_get_current_vtable
+cogl_gles2_texture_get_handle
+cogl_gles2_texture_2d_new_from_handle
+
#ifdef COGL_HAS_GLIB_SUPPORT
cogl_glib_source_new
#endif
@@ -315,6 +331,7 @@ cogl_is_attribute
cogl_is_attribute_buffer
cogl_is_bitmap
cogl_is_buffer
+cogl_is_gles2_context
cogl_is_context
cogl_is_index_buffer
#if 0
@@ -328,7 +345,9 @@ cogl_is_pipeline
cogl_is_pixel_buffer_EXP
cogl_is_primitive
cogl_is_primitive_texture
+cogl_is_program
cogl_is_renderer
+cogl_is_shader
cogl_is_snippet
cogl_is_sub_texture_EXP
cogl_is_texture
@@ -415,6 +434,7 @@ cogl_matrix_get_inverse
cogl_matrix_init_from_array
cogl_matrix_init_translation
cogl_matrix_is_identity
+cogl_matrix_init_from_euler
cogl_matrix_init_from_quaternion
cogl_matrix_init_identity
cogl_matrix_look_at
@@ -426,6 +446,12 @@ cogl_matrix_orthographic
cogl_matrix_perspective
cogl_matrix_project_points
cogl_matrix_rotate
+
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_matrix_rotate_euler
+cogl_matrix_rotate_quaternion
+#endif
+
cogl_matrix_scale
cogl_matrix_transform_point
cogl_matrix_transform_points
@@ -443,14 +469,19 @@ cogl_object_unref
cogl_offscreen_new_to_texture
+cogl_onscreen_add_resize_handler
cogl_onscreen_add_swap_buffers_callback
#ifndef COGL_WINSYS_INTEGRATED
cogl_onscreen_clutter_backend_set_size_CLUTTER
#endif
+cogl_onscreen_get_resizable
cogl_onscreen_hide
cogl_onscreen_new
cogl_onscreen_set_swap_throttled
+cogl_onscreen_remove_resize_handler
cogl_onscreen_remove_swap_buffers_callback
+cogl_onscreen_set_resizable
+cogl_onscreen_set_swap_throttled
cogl_onscreen_show
cogl_onscreen_swap_buffers
cogl_onscreen_swap_region
@@ -568,6 +599,7 @@ cogl_polygon
cogl_pop_draw_buffer
#endif
cogl_pop_framebuffer
+cogl_pop_gles2_context
cogl_pop_matrix
cogl_pop_source
@@ -595,11 +627,37 @@ cogl_primitive_set_n_vertices_EXP
cogl_primitive_texture_set_auto_mipmap
+cogl_program_attach_shader
+cogl_program_get_uniform_location
+cogl_program_link
+
+#ifndef COGL_DISABLE_DEPRECATED
+cogl_program_ref
+#endif
+
+cogl_program_set_uniform_float
+cogl_program_set_uniform_int
+cogl_program_set_uniform_matrix
+cogl_program_set_uniform_1f
+cogl_program_set_uniform_1i
+
+#ifndef COGL_DISABLE_DEPRECATED
+cogl_program_uniform_float
+cogl_program_uniform_int
+cogl_program_uniform_matrix
+cogl_program_uniform_1f
+cogl_program_uniform_1i
+cogl_program_unref
+#endif
+
+cogl_program_use
+
#ifndef COGL_DISABLE_DEPRECATED
cogl_push_draw_buffer
#endif
cogl_push_framebuffer
+cogl_push_gles2_context
cogl_push_matrix
cogl_push_source
@@ -651,14 +709,12 @@ cogl_rotate
cogl_scale
-<<<<<<< HEAD
cogl_set_backface_culling_enabled
cogl_set_depth_test_enabled
#ifndef COGL_DISABLE_DEPRECATED
cogl_set_draw_buffer
#endif
cogl_set_fog
-=======
#ifdef COGL_HAS_SDL_SUPPORT
cogl_sdl_context_new
cogl_sdl_handle_event
@@ -667,9 +723,9 @@ cogl_sdl_renderer_get_event_type
cogl_sdl_renderer_set_event_type
#endif
->>>>>>> 2625354... Update cogl.symbols
cogl_set_framebuffer
cogl_set_modelview_matrix
+cogl_set_path
cogl_set_projection_matrix
cogl_set_source
cogl_set_source_color
@@ -678,6 +734,21 @@ cogl_set_source_color4ub
cogl_set_source_texture
cogl_set_viewport
+cogl_shader_compile
+cogl_shader_get_info_log
+cogl_shader_get_type
+cogl_shader_is_compiled
+
+#ifndef COGL_DISABLE_DEPRECATED
+cogl_shader_ref
+#endif
+
+cogl_shader_source
+
+#ifndef COGL_DISABLE_DEPRECATED
+cogl_shader_unref
+#endif
+
cogl_snippet_get_declarations
cogl_snippet_get_hook
cogl_snippet_get_post
@@ -786,6 +857,7 @@ cogl_viewport
cogl_winsys_feature_get_type
#ifdef COGL_HAS_WAYLAND_EGL_SERVER_SUPPORT
+cogl_wayland_display_set_compositor_display
cogl_wayland_onscreen_resize
cogl_wayland_renderer_get_compositor
cogl_wayland_renderer_get_display
@@ -793,7 +865,7 @@ cogl_wayland_renderer_get_shell
cogl_wayland_renderer_set_foreign_compositor
cogl_wayland_renderer_set_foreign_display
cogl_wayland_renderer_set_foreign_shell
-cogl_wayland_texture_2d_new_from_buffer_EXP
+cogl_wayland_texture_2d_new_from_buffer
#endif
#ifdef COGL_HAS_WIN32_SUPPORT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]