[Cogl] [PATCH] Revert "Add compatibility API for functions removed after 1.9.8"
Robert Bragg
robert at sixbynine.org
Mon Apr 16 04:24:42 PDT 2012
Thanks this looks good to me:
Reviewed-by: Robert Bragg <robert at linux.intel.com>
On Mon, Apr 16, 2012 at 12:17 PM, Neil Roberts <neil at linux.intel.com> wrote:
> This reverts commit 361bd516f3d678d6d8ec08c1f01cf872e10a4f43.
>
> This patch was only added to provide compatibility with the 1.9.8
> release after an API cleanup removed some redundant experimental
> symbols. This is no longer needed because the master branch is now
> able to break API again.
>
> I've also removed some later changes that were added to reflect the
> patch in the MSVC project files.
>
> Conflicts:
>
> cogl/Makefile.am
> ---
> build/win32/vs10/cogl.props | 2 -
> build/win32/vs9/cogl.vsprops | 1 -
> cogl/Makefile.am | 2 -
> cogl/cogl.h | 2 -
> cogl/cogl2-compatibility.c | 148 ------------------------------------------
> cogl/cogl2-compatibility.h | 55 ----------------
> 6 files changed, 0 insertions(+), 210 deletions(-)
> delete mode 100644 cogl/cogl2-compatibility.c
> delete mode 100644 cogl/cogl2-compatibility.h
>
> diff --git a/build/win32/vs10/cogl.props b/build/win32/vs10/cogl.props
> index df727be..7dccf72 100644
> --- a/build/win32/vs10/cogl.props
> +++ b/build/win32/vs10/cogl.props
> @@ -183,8 +183,6 @@ copy ..\..\..\cogl\cogl2-path.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
>
> copy ..\..\..\cogl\cogl2-experimental.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
>
> -copy ..\..\..\cogl\cogl2-compatibility.h $(CopyDir)\include\cogl-$(CoglApiVersion)\cogl
> -
> </CoglDoInstall>
> <GenerateCoglDef>
> echo EXPORTS > ..\..\..\cogl\cogl.def
> diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
> index 4c88f33..a42c4d7 100644
> --- a/build/win32/vs9/cogl.vsprops
> +++ b/build/win32/vs9/cogl.vsprops
> @@ -170,7 +170,6 @@ copy ..\..\..\cogl\cogl-win32-renderer.h $(OutDir)\include\cogl-$(CoglApiVersion
> copy ..\..\..\cogl\cogl1-context.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

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

> copy ..\..\..\cogl\cogl2-experimental.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

> -copy ..\..\..\cogl\cogl2-compatibility.h $(OutDir)\include\cogl-$(CoglApiVersion)\cogl

>
> mkdir $(OutDir)\share\cogl-$(CoglApiVersion)\tests

> copy ..\..\..\tests\data\valgrind.suppressions $(OutDir)\share\cogl-$(CoglApiVersion)\tests

> diff --git a/cogl/Makefile.am b/cogl/Makefile.am
> index f7e6cdc..c761868 100644
> --- a/cogl/Makefile.am
> +++ b/cogl/Makefile.am
> @@ -99,7 +99,6 @@ cogl_experimental_h = \
> $(srcdir)/cogl-depth-state.h \
> $(srcdir)/cogl-buffer.h \
> $(srcdir)/cogl-pixel-buffer.h \
> - $(srcdir)/cogl2-compatibility.h \
> $(NULL)
>
> # driver sources
> @@ -210,7 +209,6 @@ cogl_sources_c = \
> $(srcdir)/cogl-clip-state-private.h \
> $(srcdir)/cogl-clip-state.h \
> $(srcdir)/cogl-clip-state.c \
> - $(srcdir)/cogl2-compatibility.c \
> $(srcdir)/cogl-feature-private.h \
> $(srcdir)/cogl-feature-private.c \
> $(srcdir)/cogl-color-private.h \
> diff --git a/cogl/cogl.h b/cogl/cogl.h
> index a1e296d..8f3dd1e 100644
> --- a/cogl/cogl.h
> +++ b/cogl/cogl.h
> @@ -124,8 +124,6 @@
> */
> #ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
> #include <cogl/cogl2-path.h>
> -/* This header will be removed in Cogl 1.12 */
> -#include <cogl/cogl2-compatibility.h>
> #endif
>
> /*
> diff --git a/cogl/cogl2-compatibility.c b/cogl/cogl2-compatibility.c
> deleted file mode 100644
> index bae88c2..0000000
> --- a/cogl/cogl2-compatibility.c
> +++ /dev/null
> @@ -1,148 +0,0 @@
> -/*
> - * Cogl
> - *
> - * An object oriented GL/GLES Abstraction/Utility Layer
> - *
> - * Copyright (C) 2012 Intel Corporation.
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library. If not, see
> - * <http://www.gnu.org/licenses/>.
> - *
> - */
> -
> -#ifdef HAVE_CONFIG_H
> -#include "config.h"
> -#endif
> -
> -/* These functions are just here temporarily for the 1.10.x releases
> - to maintain ABI compatibility. They will be removed again
> - immediately once the branch for 1.12.x is created */
> -
> -#include "cogl2-compatibility.h"
> -#include "cogl-framebuffer.h"
> -#include "cogl-index-buffer.h"
> -#include "cogl-pipeline.h"
> -
> -void
> -cogl_clip_push_from_path (CoglPath *path)
> -{
> - cogl_framebuffer_push_path_clip (cogl_get_draw_framebuffer (), path);
> -}
> -
> -/* These were never declared in a public header so we might as well
> - keep it that way. The declarations here are just to avoid a
> - warning */
> -GQuark
> -cogl_display_error_quark (void);
> -
> -GQuark
> -cogl_onscreen_template_error_quark (void);
> -
> -GQuark
> -cogl_swap_chain_error_quark (void);
> -
> -GQuark
> -cogl_texture_3d_error_quark (void);
> -
> -gboolean
> -cogl_index_buffer_allocate (CoglIndexBuffer *indices,
> - GError *error);
> -
> -gboolean
> -cogl_is_journal (void *object);
> -
> -void
> -cogl_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
> - CoglPipeline *pipeline,
> - CoglVerticesMode mode,
> - int first_vertex,
> - int n_vertices,
> - CoglIndices *indices,
> - ...);
> -
> -GQuark
> -cogl_display_error_quark (void)
> -{
> - return g_quark_from_static_string ("cogl-display-error-quark");
> -}
> -
> -GQuark
> -cogl_onscreen_template_error_quark (void)
> -{
> - return g_quark_from_static_string ("cogl-onscreen-template-error-quark");
> -}
> -
> -GQuark
> -cogl_swap_chain_error_quark (void)
> -{
> - return g_quark_from_static_string ("cogl-swap-chain-error-quark");
> -}
> -
> -GQuark
> -cogl_texture_3d_error_quark (void)
> -{
> - return g_quark_from_static_string ("cogl-texture-3d-error-quark");
> -}
> -
> -gboolean
> -cogl_index_buffer_allocate (CoglIndexBuffer *indices,
> - GError *error)
> -{
> - return TRUE;
> -}
> -
> -gboolean
> -cogl_is_journal (void *object)
> -{
> - /* There's no way to get a pointer to a journal so this will never
> - return TRUE from an application's perspective */
> - return FALSE;
> -}
> -
> -void
> -cogl_vdraw_indexed_attributes (CoglFramebuffer *framebuffer,
> - CoglPipeline *pipeline,
> - CoglVerticesMode mode,
> - int first_vertex,
> - int n_vertices,
> - CoglIndices *indices,
> - ...)
> -{
> - va_list ap;
> - int n_attributes;
> - CoglAttribute **attributes;
> - int i;
> - CoglAttribute *attribute;
> -
> - va_start (ap, indices);
> - for (n_attributes = 0; va_arg (ap, CoglAttribute *); n_attributes++)
> - ;
> - va_end (ap);
> -
> - attributes = g_alloca (sizeof (CoglAttribute *) * n_attributes);
> -
> - va_start (ap, indices);
> - for (i = 0; (attribute = va_arg (ap, CoglAttribute *)); i++)
> - attributes[i] = attribute;
> - va_end (ap);
> -
> - cogl_framebuffer_draw_indexed_attributes (framebuffer,
> - pipeline,
> - mode,
> - first_vertex,
> - n_vertices,
> - indices,
> - attributes,
> - n_attributes);
> -}
> diff --git a/cogl/cogl2-compatibility.h b/cogl/cogl2-compatibility.h
> deleted file mode 100644
> index 3c9f979..0000000
> --- a/cogl/cogl2-compatibility.h
> +++ /dev/null
> @@ -1,55 +0,0 @@
> -/*
> - * Cogl
> - *
> - * An object oriented GL/GLES Abstraction/Utility Layer
> - *
> - * Copyright (C) 2012 Intel Corporation.
> - *
> - * This library is free software; you can redistribute it and/or
> - * modify it under the terms of the GNU Lesser General Public
> - * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> - *
> - * This library is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * Lesser General Public License for more details.
> - *
> - * You should have received a copy of the GNU Lesser General Public
> - * License along with this library. If not, see <http://www.gnu.org/licenses/>.
> - *
> - *
> - */
> -
> -#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
> -#error "Only <cogl/cogl.h> can be included directly."
> -#endif
> -
> -#ifndef __COGL2_COMPATIBILITY_H__
> -#define __COGL2_COMPATIBILITY_H__
> -
> -#include <cogl/cogl-types.h>
> -#include <cogl/cogl2-path.h>
> -
> -G_BEGIN_DECLS
> -
> -#define cogl_clip_push_from_path cogl2_clip_push_from_path
> -/**
> - * cogl_clip_push_from_path:
> - * @path: The path to clip with.
> - *
> - * Sets a new clipping area using the silhouette of the specified,
> - * filled @path. The clipping area is intersected with the previous
> - * clipping area. To restore the previous clipping area, call
> - * call cogl_clip_pop().
> - *
> - * Since: 1.8
> - * Stability: Unstable
> - */
> -void
> -cogl_clip_push_from_path (CoglPath *path);
> -
> -G_END_DECLS
> -
> -#endif /* __COGL2_COMPATIBILITY_H__ */
> -
> --
> 1.7.3.16.g9464b
>
> _______________________________________________
> Cogl mailing list
> Cogl at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/cogl
More information about the Cogl
mailing list