[cogl/msvc-support] Visual C++ support updates
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cogl/msvc-support] Visual C++ support updates
- Date: Thu, 3 Nov 2011 08:40:40 +0000 (UTC)
commit 76718299d1eda4476b1df79ad5377381de152996
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Nov 3 16:39:58 2011 +0800
Visual C++ support updates
Updated cogl.smbols and the property sheets due to the following commits:
63461c0f
framebuffer: Add explicit buffer discard API
a74c81ad
onscreen: Support multisample based onscreen rendering
dd7b16fa
offscreen: Adds support for offscreen multisampling
a8efe6af
framebuffer: Adds experimental _finish() API
f6daed62
clip: Adds cogl_clip_push_primitive API
6253b09c
texture-2d-sliced: make CoglTexture2DSliced public
426c8b8f
features: Support more than 32 features!
1d8fd64e
meta-texture: This publicly exposes CoglMetaTexture
79719347
framebuffer: split out CoglOnscreen code
90f10611
texture: Make CoglTextureRectangle experimentally public
1ee861a8
framebuffer: adds cogl_framebuffer_get_samples_per_pixel
18fb1ffab
texture: Make CoglSubTexture experimental public api
build/win32/vs10/cogl.props | 16 +++++++++++++---
build/win32/vs9/cogl.vsprops | 11 ++++++++---
cogl/cogl.symbols | 35 +++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 6 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 8d1a700..adacca1 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -30,7 +30,7 @@ if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H
cd ..\..\..\cogl
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.h
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-texture-rectangle.h ./cogl-texture-2d-sliced.h ./cogl-sub-texture.h ./cogl-meta-texture.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-onscreen.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.h
cd ..\build\win32\vs10
@@ -41,7 +41,7 @@ if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C
cd ..\..\..\cogl
-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.c
+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-texture-rectangle.h ./cogl-texture-2d-sliced.h ./cogl-sub-texture.h ./cogl-meta-texture.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-onscreen.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.c
cd ..\build\win32\vs10
@@ -105,6 +105,8 @@ copy ..\..\..\cogl\cogl-matrix.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-offscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+copy ..\..\..\cogl\cogl-onscreen.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
copy ..\..\..\cogl\cogl-primitives.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
@@ -123,6 +125,14 @@ copy ..\..\..\cogl\cogl-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-texture-2d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-sub-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-texture-rectangle.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
+copy ..\..\..\cogl\cogl-meta-texture.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
+
copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
@@ -196,7 +206,7 @@ copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
<DisableSpecificWarnings>4819;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index ba0fe50..0338661 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -9,7 +9,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..;..\..\..\cogl;..\..\..\cogl\winsys;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include"
- PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES"
+ PreprocessorDefinitions="G_DISABLE_SINGLE_INCLUDES;COGL_HAS_GLIB_SUPPORT"
ForcedIncludeFiles="msvc_recommended_pragmas.h"
DisableSpecificWarnings="4819"
/>
@@ -67,13 +67,13 @@ copy ..\..\..\cogl\cogl-defines.h.win32 ..\..\..\cogl\cogl-defines.h

if exist ..\..\..\cogl\cogl-enum-types.h goto DONE_COGL_ENUMS_H

cd ..\..\..\cogl

-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.h

+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.h.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-texture-rectangle.h ./cogl-texture-2d-sliced.h ./cogl-sub-texture.h ./cogl-meta-texture.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-onscreen.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.h

cd ..\build\win32\vs9

:DONE_COGL_ENUMS_H

if exist ..\..\..\cogl\cogl-enum-types.c goto DONE_COGL_ENUMS_C

cd ..\..\..\cogl

-perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.c

+perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template cogl-enum-types.c.in ./cogl-object.h ./cogl-bitmap.h ./cogl-buffer.h ./cogl-color.h ./cogl-fixed.h ./cogl-depth-state.h ./cogl-material-compat.h ./cogl-vector.h ./cogl-euler.h ./cogl-quaternion.h ./cogl-matrix.h ./cogl-offscreen.h ./cogl-primitives.h ./cogl-path.h ./cogl-pixel-buffer.h ./cogl-shader.h ./cogl-texture.h ./cogl-texture-2d.h ./cogl-texture-3d.h ./cogl-texture-rectangle.h ./cogl-texture-2d-sliced.h ./cogl-sub-texture.h ./cogl-meta-texture.h ./cogl-types.h ./cogl-vertex-buffer.h ./cogl-index-buffer.h ./cogl-attribute-buffer.h ./cogl-indices.h ./cogl-attribute.h ./cogl-primitive.h ./cogl-clip-state.h ./cogl-framebuffer.h ./cogl-onscreen.h ./cogl-clutter.h ./cogl.h ./cogl-win32-renderer.h > cogl-enum-types.c

cd ..\build\win32\vs9

:DONE_COGL_ENUMS_C

@@ -113,6 +113,7 @@ copy ..\..\..\cogl\cogl-quaternion.h $(OutDir)\include\cogl-$(CoglApiVersion)\co
copy ..\..\..\cogl\cogl-vector.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-matrix.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-offscreen.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-onscreen.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-primitives.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-path.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-pipeline-layer-state.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

@@ -121,6 +122,10 @@ copy ..\..\..\cogl\cogl-pixel-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\
copy ..\..\..\cogl\cogl-shader.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-texture-2d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-2d-sliced.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-sub-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-texture-rectangle.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

+copy ..\..\..\cogl\cogl-meta-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-texture-3d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-types.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

copy ..\..\..\cogl\cogl-vertex-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index 77e644b..4cd0b09 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -108,6 +108,10 @@ cogl_clip_push_rectangle
cogl_clip_push_window_rect
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_clip_push_primitive_EXP
+#endif
+
#ifndef COGL_DISABLE_DEPRECATED
cogl_clip_push_window_rectangle
cogl_clip_stack_restore
@@ -231,6 +235,11 @@ cogl_fixed_sin
cogl_fixed_sqrt
cogl_fixed_tan
cogl_fog_mode_get_type
+
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_foreach_feature_EXP
+#endif
+
cogl_flush
#ifdef COGL_ENABLE_EXPERIMENTAL_API
@@ -238,6 +247,9 @@ 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_finish
cogl_framebuffer_get_alpha_bits_EXP
cogl_framebuffer_get_blue_bits_EXP
cogl_framebuffer_get_color_format_EXP
@@ -247,6 +259,7 @@ cogl_framebuffer_get_dither_enabled
cogl_framebuffer_get_green_bits_EXP
cogl_framebuffer_get_height_EXP
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
@@ -254,8 +267,11 @@ cogl_framebuffer_get_viewport_x_EXP
cogl_framebuffer_get_viewport_y_EXP
cogl_framebuffer_get_width_EXP
cogl_framebuffer_remove_swap_buffers_callback_EXP
+cogl_framebuffer_resolve_samples_EXP
+cogl_framebuffer_resolve_samples_region_EXP
cogl_framebuffer_set_color_mask_EXP
cogl_framebuffer_set_dither_enabled
+cogl_framebuffer_set_samples_per_pixel_EXP
cogl_framebuffer_set_viewport_EXP
cogl_framebuffer_swap_buffers_EXP
cogl_framebuffer_swap_region_EXP
@@ -303,6 +319,8 @@ cogl_handle_ref
cogl_handle_unref
#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_has_feature_EXP
+cogl_has_features_EXP
cogl_index_buffer_new
cogl_indices_get_buffer
cogl_indices_get_offset
@@ -347,9 +365,16 @@ cogl_is_renderer_EXP
#endif
cogl_is_shader
+
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_is_sub_texture_EXP
+#endif
+
cogl_is_texture
#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_is_texture_rectangle_EXP
+
cogl_is_texture_2d_EXP
cogl_is_texture_3d_EXP
#endif
@@ -469,6 +494,8 @@ cogl_matrix_translate
#ifdef COGL_ENABLE_EXPERIMENTAL_API
cogl_matrix_view_2d_in_frustum_EXP
cogl_matrix_view_2d_in_perspective_EXP
+
+cogl_meta_texture_foreach_in_region
#endif
cogl_object_get_user_data
@@ -491,6 +518,7 @@ cogl_onscreen_new_EXP
cogl_onscreen_set_swap_throttled_EXP
cogl_onscreen_show_EXP
cogl_onscreen_template_new_EXP
+cogl_onscreen_template_set_samples_per_pixel
#ifdef COGL_HAS_WIN32_SUPPORT
cogl_win32_onscreen_get_window_EXP
cogl_win32_onscreen_set_foreign_window_EXP
@@ -743,6 +771,8 @@ cogl_shader_type_get_type
cogl_sqrti
#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_sub_texture_new_EXP
+
cogl_swap_chain_new_EXP
cogl_swap_chain_set_has_alpha_EXP
cogl_swap_chain_set_length_EXP
@@ -770,6 +800,10 @@ cogl_texture_new_from_foreign
cogl_texture_new_from_sub_texture
cogl_texture_new_with_size
+#ifdef COGL_ENABLE_EXPERIMENTAL_API
+cogl_texture_rectangle_new_with_size_EXP
+#endif
+
#ifndef COGL_DISABLE_DEPRECATED
cogl_texture_ref
#endif
@@ -788,6 +822,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_3d_new_from_data_EXP
cogl_texture_3d_new_with_size_EXP
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
