From 835ded3f02a013c07d97c3548afdda18beb7968c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 15 Jun 2016 18:43:03 -0400 Subject: [PATCH] cogl: Remove deprecated CoglTexture functions None were used; no reason to keep them. https://bugzilla.gnome.org/show_bug.cgi?id=768977 --- cogl/cogl/Makefile.am | 2 - cogl/cogl/cogl.h | 1 - .../cogl/deprecated/cogl-texture-deprecated.c | 85 -------------- .../cogl/deprecated/cogl-texture-deprecated.h | 107 ------------------ 4 files changed, 195 deletions(-) delete mode 100644 cogl/cogl/deprecated/cogl-texture-deprecated.c delete mode 100644 cogl/cogl/deprecated/cogl-texture-deprecated.h diff --git a/cogl/cogl/Makefile.am b/cogl/cogl/Makefile.am index 3f3856e48..7c1eac4e3 100644 --- a/cogl/cogl/Makefile.am +++ b/cogl/cogl/Makefile.am @@ -55,7 +55,6 @@ cogl_deprecated_h = \ deprecated/cogl-clutter.h \ deprecated/cogl-type-casts.h \ deprecated/cogl-framebuffer-deprecated.h \ - deprecated/cogl-texture-deprecated.h \ deprecated/cogl-auto-texture.h \ $(NULL) @@ -391,7 +390,6 @@ cogl_sources_c = \ deprecated/cogl-shader.c \ deprecated/cogl-clutter.c \ deprecated/cogl-framebuffer-deprecated.c \ - deprecated/cogl-texture-deprecated.c \ $(NULL) cogl_experimental_h += cogl-glib-source.h diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index d71dd8aaa..5d8c4e21a 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -83,7 +83,6 @@ #include #include #include -#include #endif /* It would be good to move these casts up into 1.x only api if we can diff --git a/cogl/cogl/deprecated/cogl-texture-deprecated.c b/cogl/cogl/deprecated/cogl-texture-deprecated.c deleted file mode 100644 index d15114fae..000000000 --- a/cogl/cogl/deprecated/cogl-texture-deprecated.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2014 Intel Corporation. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * - */ - -#include "cogl-config.h" - -#include "cogl-types.h" -#include "cogl-texture.h" -#include "cogl-texture-private.h" -#include "cogl-object-private.h" -#include "deprecated/cogl-texture-deprecated.h" - -CoglPixelFormat -cogl_texture_get_format (CoglTexture *texture) -{ - return _cogl_texture_get_format (texture); -} - -unsigned int -cogl_texture_get_rowstride (CoglTexture *texture) -{ - CoglPixelFormat format = cogl_texture_get_format (texture); - /* FIXME: This function should go away. It previously just returned - the rowstride that was used to upload the data as far as I can - tell. This is not helpful */ - - /* Just guess at a suitable rowstride */ - return (_cogl_pixel_format_get_bytes_per_pixel (format) - * cogl_texture_get_width (texture)); -} - -void * -cogl_texture_ref (void *object) -{ - if (!cogl_is_texture (object)) - return NULL; - - _COGL_OBJECT_DEBUG_REF (CoglTexture, object); - - cogl_object_ref (object); - - return object; -} - -void -cogl_texture_unref (void *object) -{ - if (!cogl_is_texture (object)) - { - g_warning (G_STRINGIFY (cogl_texture_unref) - ": Ignoring unref of CoglObject " - "due to type mismatch"); - return; - } - - _COGL_OBJECT_DEBUG_UNREF (CoglTexture, object); - - cogl_object_unref (object); -} diff --git a/cogl/cogl/deprecated/cogl-texture-deprecated.h b/cogl/cogl/deprecated/cogl-texture-deprecated.h deleted file mode 100644 index 890f365d6..000000000 --- a/cogl/cogl/deprecated/cogl-texture-deprecated.h +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2014 Intel Corporation. - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, copy, - * modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * - * - */ - -#ifndef __COGL_TEXTURE_DEPRECATED_H__ -#define __COGL_TEXTURE_DEPRECATED_H__ - -#include - -/** - * cogl_texture_get_format: - * @texture: a #CoglTexture pointer. - * - * Queries the #CoglPixelFormat of a cogl texture. - * - * Return value: the #CoglPixelFormat of the GPU side texture - * Deprecated: 1.18: This api is misleading - */ -COGL_DEPRECATED_IN_1_18 -CoglPixelFormat -cogl_texture_get_format (CoglTexture *texture); - -/** - * cogl_texture_get_rowstride: - * @texture a #CoglTexture pointer. - * - * Determines the bytes-per-pixel for the #CoglPixelFormat retrieved - * from cogl_texture_get_format() and multiplies that by the texture's - * width. - * - * It's very unlikely that anyone would need to use this API to - * query the internal rowstride of a #CoglTexture which can just be - * considered an implementation detail. Actually it's not even useful - * internally since underlying drivers are free to use a different - * format - * - * This API is only here for backwards compatibility and - * shouldn't be used in new code. In particular please don't be - * mislead to pass the returned value to cogl_texture_get_data() for - * the rowstride, since you should be passing the rowstride you desire - * for your destination buffer not the rowstride of the source - * texture. - * - * Return value: The bytes-per-pixel for the current format - * multiplied by the texture's width - * - * Deprecated: 1.10: There's no replacement for the API but there's - * also no known need for API either. It was just - * a mistake that it was ever published. - */ -COGL_DEPRECATED_IN_1_10 -unsigned int -cogl_texture_get_rowstride (CoglTexture *texture); - -/** - * cogl_texture_ref: (skip) - * @texture: a #CoglTexture. - * - * Increment the reference count for a cogl texture. - * - * Deprecated: 1.2: Use cogl_object_ref() instead - * - * Return value: the @texture pointer. - */ -COGL_DEPRECATED_FOR (cogl_object_ref) -void * -cogl_texture_ref (void *texture); - -/** - * cogl_texture_unref: (skip) - * @texture: a #CoglTexture. - * - * Decrement the reference count for a cogl texture. - * - * Deprecated: 1.2: Use cogl_object_unref() instead - */ -COGL_DEPRECATED_FOR (cogl_object_unref) -void -cogl_texture_unref (void *texture); - -#endif /* __COGL_TEXTURE_DEPRECATED_H__ */