GNOME.org
 

[cogl/wip/cogl-2.0: 4/5] Remove deprecated cogl_vertex_buffer api

commit 2437727efa68d693804d78f952786e96047ebc6f
Author: Robert Bragg <robert linux intel com>
Date:   Fri Apr 13 17:25:20 2012 +0100

    Remove deprecated cogl_vertex_buffer api
    
    The cogl_vertex_buffer has long since been deprecated by the
    cogl_attribute and cogl_primitive apis. The cogl_vertex_buffer api tried
    to be too clever but took away important control from the developer and
    was very cumbersome to use.

 build/win32/vs10/cogl.props                   |    4 +-
 build/win32/vs9/cogl.vsprops                  |    1 -
 cogl/Makefile.am                              |    3 -
 cogl/cogl-journal.c                           |    1 -
 cogl/cogl-pipeline-layer-state.h              |   14 +-
 cogl/cogl-primitive.h                         |    2 +-
 cogl/cogl-primitives.c                        |    1 -
 cogl/cogl-types.h                             |    2 +-
 cogl/cogl-vertex-buffer-private.h             |  158 ---
 cogl/cogl-vertex-buffer.c                     | 1787 -------------------------
 cogl/cogl-vertex-buffer.h                     |  409 ------
 cogl/cogl.h                                   |    1 -
 cogl/cogl.symbols                             |   25 +-
 doc/reference/cogl2/Makefile.am               |    2 -
 tests/conform/test-vertex-buffer-contiguous.c |  257 ----
 tests/conform/test-vertex-buffer-interleved.c |  162 ---
 tests/conform/test-vertex-buffer-mutability.c |  198 ---
 17 files changed, 13 insertions(+), 3014 deletions(-)
---
diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
index 9497f27..9525bb7 100644
--- a/build/win32/vs10/cogl.props
+++ b/build/win32/vs10/cogl.props
@@ -146,8 +146,6 @@ copy ..\..\..\cogl\cogl-texture-3d.h $(CopyDir)\include\cogl-$(CoglApiVersion)\c
 
 copy ..\..\..\cogl\cogl-types.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
-copy ..\..\..\cogl\cogl-vertex-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
-
 copy ..\..\..\cogl\cogl-index-buffer.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
 
 copy ..\..\..\cogl\cogl-indices.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
@@ -294,4 +292,4 @@ copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersio
       <Value>$(CoglDllSuffix)</Value>
     </BuildMacro>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index ef4de04..608e838 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -151,7 +151,6 @@ copy ..\..\..\cogl\cogl-texture-rectangle.h $(OutDir)\include\cogl-$(CoglApiVers
 copy ..\..\..\cogl\cogl-meta-texture.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-texture-3d.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-types.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
-copy ..\..\..\cogl\cogl-vertex-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-index-buffer.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-indices.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
 copy ..\..\..\cogl\cogl-attribute.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl&#x0D;&#x0A;
diff --git a/cogl/Makefile.am b/cogl/Makefile.am
index 41deac8..e6bb4d7 100644
--- a/cogl/Makefile.am
+++ b/cogl/Makefile.am
@@ -60,7 +60,6 @@ cogl_1_public_h = \
 	$(srcdir)/cogl-shader.h 		\
 	$(srcdir)/cogl-texture.h 		\
 	$(srcdir)/cogl-types.h 			\
-	$(srcdir)/cogl-vertex-buffer.h 		\
 	$(srcdir)/cogl-clutter.h       		\
 	$(srcdir)/cogl.h			\
 	$(NULL)
@@ -221,8 +220,6 @@ cogl_sources_c = \
 	$(srcdir)/cogl-buffer.c				\
 	$(srcdir)/cogl-pixel-buffer-private.h		\
 	$(srcdir)/cogl-pixel-buffer.c			\
-	$(srcdir)/cogl-vertex-buffer-private.h 		\
-	$(srcdir)/cogl-vertex-buffer.c			\
 	$(srcdir)/cogl-index-buffer-private.h		\
 	$(srcdir)/cogl-index-buffer.c			\
 	$(srcdir)/cogl-attribute-buffer-private.h	\
diff --git a/cogl/cogl-journal.c b/cogl/cogl-journal.c
index 7b7a3e9..8aeee59 100644
--- a/cogl/cogl-journal.c
+++ b/cogl/cogl-journal.c
@@ -32,7 +32,6 @@
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"
-#include "cogl-vertex-buffer-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-profile.h"
 #include "cogl-attribute-private.h"
diff --git a/cogl/cogl-pipeline-layer-state.h b/cogl/cogl-pipeline-layer-state.h
index bfe0483..90dbc6a 100644
--- a/cogl/cogl-pipeline-layer-state.h
+++ b/cogl/cogl-pipeline-layer-state.h
@@ -84,13 +84,13 @@ typedef enum {
  *   texture. This is useful to avoid artifacts if only one copy of
  *   the texture is being rendered.
  * @COGL_PIPELINE_WRAP_MODE_AUTOMATIC: Cogl will try to automatically
- *   decide which of the above two to use. For cogl_rectangle(), it
- *   will use repeat mode if any of the texture coordinates are
- *   outside the range 0â1, otherwise it will use clamp to edge. For
- *   cogl_polygon() it will always use repeat mode. For
- *   cogl_vertex_buffer_draw() it will use repeat mode except for
- *   layers that have point sprite coordinate generation enabled. This
- *   is the default value.
+ *   decide which of the above two to use. For
+ *   cogl_framebuffer_draw_rectangle(), it will use repeat mode if any
+ *   of the texture coordinates are outside the range 0â1, otherwise
+ *   it will use clamp to edge. For cogl_framebuffer_draw_attributes()
+ *   or cogl_framebuffer_draw_primitive() it will use repeat mode
+ *   except for layers that have point sprite coordinate generation
+ *   enabled. This is the default value.
  *
  * The wrap mode specifies what happens when texture coordinates
  * outside the range 0â1 are used. Note that if the filter mode is
diff --git a/cogl/cogl-primitive.h b/cogl/cogl-primitive.h
index 134bb87..b99ae87 100644
--- a/cogl/cogl-primitive.h
+++ b/cogl/cogl-primitive.h
@@ -36,7 +36,7 @@
  */
 typedef struct _CoglPrimitive CoglPrimitive;
 
-#include <cogl/cogl-vertex-buffer.h> /* for CoglVerticesMode */
+#include <cogl/cogl-types.h>
 #include <cogl/cogl-attribute.h>
 
 G_BEGIN_DECLS
diff --git a/cogl/cogl-primitives.c b/cogl/cogl-primitives.c
index 7323498..80292dc 100644
--- a/cogl/cogl-primitives.c
+++ b/cogl/cogl-primitives.c
@@ -32,7 +32,6 @@
 #include "cogl-texture-private.h"
 #include "cogl-pipeline-private.h"
 #include "cogl-pipeline-opengl-private.h"
-#include "cogl-vertex-buffer-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-attribute-private.h"
 #include "cogl-private.h"
diff --git a/cogl/cogl-types.h b/cogl/cogl-types.h
index 92c5e9a..82d4721 100644
--- a/cogl/cogl-types.h
+++ b/cogl/cogl-types.h
@@ -341,7 +341,7 @@ typedef enum { /*< prefix=COGL_PIXEL_FORMAT >*/
  * @COGL_FEATURE_PBOS: PBO support
  * @COGL_FEATURE_UNSIGNED_INT_INDICES: Set if
  *     %COGL_INDICES_TYPE_UNSIGNED_INT is supported in
- *     cogl_vertex_buffer_indices_new().
+ *     cogl_indices_new().
  * @COGL_FEATURE_DEPTH_RANGE: cogl_material_set_depth_range() support
  * @COGL_FEATURE_TEXTURE_NPOT_BASIC: The hardware supports non power
  *     of two textures, but you also need to check the
diff --git a/cogl/cogl.h b/cogl/cogl.h
index 41cdcd0..ac27629 100644
--- a/cogl/cogl.h
+++ b/cogl/cogl.h
@@ -67,7 +67,6 @@
 #ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API
 #include <cogl/cogl-path.h>
 #include <cogl/cogl-clip-state.h>
-#include <cogl/cogl-vertex-buffer.h>
 #include <cogl/cogl-enum-types.h>
 #include <cogl/cogl-material-compat.h>
 #include <cogl/cogl-shader.h>
diff --git a/cogl/cogl.symbols b/cogl/cogl.symbols
index c0017f3..978c198 100644
--- a/cogl/cogl.symbols
+++ b/cogl/cogl.symbols
@@ -333,7 +333,7 @@ cogl_is_index_buffer
 cogl_is_indices_array
 #endif
 cogl_is_material
-cogl_is_offscreen 
+cogl_is_offscreen
 cogl_is_path
 cogl_is_pipeline
 cogl_is_pixel_buffer_EXP
@@ -794,25 +794,6 @@ cogl_vector3_multiply_scalar
 cogl_vector3_normalize
 cogl_vector3_subtract
 
-cogl_vertex_buffer_add
-cogl_vertex_buffer_delete
-cogl_vertex_buffer_disable
-cogl_vertex_buffer_draw
-cogl_vertex_buffer_draw_elements
-cogl_vertex_buffer_enable
-cogl_vertex_buffer_get_n_vertices
-cogl_vertex_buffer_indices_get_for_quads
-cogl_vertex_buffer_indices_get_type
-cogl_vertex_buffer_indices_new
-cogl_vertex_buffer_new
-#ifndef COGL_DISABLE_DEPRECATED
-cogl_vertex_buffer_ref
-#endif
-cogl_vertex_buffer_submit
-#ifndef COGL_DISABLE_DEPRECATED
-cogl_vertex_buffer_unref
-#endif
-
 cogl_vertices_mode_get_type
 
 #ifdef COGL_DISABLE_DEPRECATED
@@ -858,7 +839,7 @@ cogl_x11_onscreen_get_visual_xid
 cogl_x11_onscreen_set_foreign_window_xid
 #endif
 
-#ifndef COGL_NO_EXPORT_UNDERSCORE 
+#ifndef COGL_NO_EXPORT_UNDERSCORE
 /* probably these should not be exported at all, but anyways, for now... */
 /* eventually, this section should disappear (or cogl, cogl-pango, clutter et al */
 /* will link without the following) */
@@ -893,4 +874,4 @@ _cogl_texture_set_filters
 _cogl_texture_set_wrap_mode_parameters
 _cogl_texture_transform_coords_to_gl
 _cogl_texture_transform_quad_coords_to_gl
-#endif
\ No newline at end of file
+#endif
diff --git a/doc/reference/cogl2/Makefile.am b/doc/reference/cogl2/Makefile.am
index d497943..22dd8f7 100644
--- a/doc/reference/cogl2/Makefile.am
+++ b/doc/reference/cogl2/Makefile.am
@@ -96,10 +96,8 @@ IGNORE_HFILES=\
 	cogl-texture-3d-private.h		\
 	cogl-texture-private.h			\
 	cogl-texture-rectangle-private.h	\
-	cogl-vertex-buffer.h			\
 	cogl-vertex-array-private.h		\
 	cogl-vertex-attribute-private.h		\
-	cogl-vertex-buffer-private.h		\
 	cogl-blend-string.h 			\
 	cogl-clip-stack.h 			\
 	cogl-debug.h 				\
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]