From 7a91c30149aab75098d84fcc84853f697b548c90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Thu, 4 Aug 2022 20:40:49 +0200 Subject: [PATCH] cogl: Remove version The cogl version was unused, and not relevant, as the version and API is tied to the mutter API version, not the old pre fork cogl version. Part-of: --- cogl/cogl/cogl-macros.h | 2 - cogl/cogl/cogl-version.h | 132 ----------------------------- cogl/cogl/cogl.h | 1 - cogl/cogl/meson.build | 1 - cogl/cogl/winsys/cogl-winsys-glx.c | 1 - cogl/tests/conform/meson.build | 1 - cogl/tests/conform/test-version.c | 33 -------- 7 files changed, 171 deletions(-) delete mode 100644 cogl/cogl/cogl-version.h delete mode 100644 cogl/tests/conform/test-version.c diff --git a/cogl/cogl/cogl-macros.h b/cogl/cogl/cogl-macros.h index 8172354d1..b81035d2c 100644 --- a/cogl/cogl/cogl-macros.h +++ b/cogl/cogl/cogl-macros.h @@ -33,8 +33,6 @@ #ifndef __COGL_MACROS_H__ #define __COGL_MACROS_H__ -#include - /* These macros are used to mark deprecated functions, and thus have * to be exposed in a public header. * diff --git a/cogl/cogl/cogl-version.h b/cogl/cogl/cogl-version.h deleted file mode 100644 index 089c4998a..000000000 --- a/cogl/cogl/cogl-version.h +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2012,2013 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_VERSION_H__ -#define __COGL_VERSION_H__ - -#include - - -/* Macros to handle compacting a 3-component version number into an - * int for quick comparison. This assumes all of the components are <= - * 1023 and that an int is >= 31 bits */ -#define COGL_VERSION_COMPONENT_BITS 10 -#define COGL_VERSION_MAX_COMPONENT_VALUE \ - ((1 << COGL_VERSION_COMPONENT_BITS) - 1) - -/** - * COGL_VERSION_ENCODE: - * @major: The major part of a version number - * @minor: The minor part of a version number - * @micro: The micro part of a version number - * - * Encodes a 3 part version number into a single integer. This can be - * used to compare the Cogl version. For example if there is a known - * bug in Cogl versions between 1.3.2 and 1.3.4 you could use the - * following code to provide a workaround: - * - * |[ - * #if COGL_VERSION >= COGL_VERSION_ENCODE (1, 3, 2) && \ - * COGL_VERSION <= COGL_VERSION_ENCODE (1, 3, 4) - * /* Do the workaround */ - * #endif - * ]| - * - * Since: 1.12.0 - */ -#define COGL_VERSION_ENCODE(major, minor, micro) \ - (((major) << (COGL_VERSION_COMPONENT_BITS * 2)) | \ - ((minor) << COGL_VERSION_COMPONENT_BITS) \ - | (micro)) - -/** - * COGL_VERSION_GET_MAJOR: - * @version: An encoded version number - * - * Extracts the major part of an encoded version number. - * - * Since: 1.12.0 - */ -#define COGL_VERSION_GET_MAJOR(version) \ - (((version) >> (COGL_VERSION_COMPONENT_BITS * 2)) \ - & COGL_VERSION_MAX_COMPONENT_VALUE) - -/** - * COGL_VERSION_GET_MINOR: - * @version: An encoded version number - * - * Extracts the minor part of an encoded version number. - * - * Since: 1.12.0 - */ -#define COGL_VERSION_GET_MINOR(version) \ - (((version) >> COGL_VERSION_COMPONENT_BITS) & \ - COGL_VERSION_MAX_COMPONENT_VALUE) - -/** - * COGL_VERSION_GET_MICRO: - * @version: An encoded version number - * - * Extracts the micro part of an encoded version number. - * - * Since: 1.12.0 - */ -#define COGL_VERSION_GET_MICRO(version) \ - ((version) & COGL_VERSION_MAX_COMPONENT_VALUE) - -/** - * COGL_VERSION_CHECK: - * @major: The major part of a version number - * @minor: The minor part of a version number - * @micro: The micro part of a version number - * - * A convenient macro to check whether the Cogl version being compiled - * against is at least the given version number. For example if the - * function cogl_pipeline_frobnicate was added in version 2.0.1 and - * you want to conditionally use that function when it is available, - * you could write the following: - * - * |[ - * #if COGL_VERSION_CHECK (2, 0, 1) - * cogl_pipeline_frobnicate (pipeline); - * #else - * /* Frobnication is not supported. Use a red color instead */ - * cogl_pipeline_set_color_4f (pipeline, 1.0f, 0.0f, 0.0f, 1.0f); - * #endif - * ]| - * - * Return value: %TRUE if the Cogl version being compiled against is - * greater than or equal to the given three part version number. - * Since: 1.12.0 - */ -#define COGL_VERSION_CHECK(major, minor, micro) \ - (COGL_VERSION >= COGL_VERSION_ENCODE (major, minor, micro)) - -#endif /* __COGL_VERSION_H__ */ diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index dad3b93f3..dfb6c7483 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -67,7 +67,6 @@ #include #include #include -#include /* * 1.x only api... diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build index 0bbf58bb9..c2bb2e7d4 100644 --- a/cogl/cogl/meson.build +++ b/cogl/cogl/meson.build @@ -113,7 +113,6 @@ cogl_nonintrospected_headers = [ 'cogl-pixel-buffer.h', 'cogl-macros.h', 'cogl-fence.h', - 'cogl-version.h', 'cogl-gtype-private.h', 'cogl-glib-source.h', 'cogl-scanout.h', diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c index f3230ef5d..7a74d7fee 100644 --- a/cogl/cogl/winsys/cogl-winsys-glx.c +++ b/cogl/cogl/winsys/cogl-winsys-glx.c @@ -51,7 +51,6 @@ #include "cogl-xlib-renderer.h" #include "cogl-util.h" #include "cogl-poll-private.h" -#include "cogl-version.h" #include "cogl-glx.h" #include "driver/gl/cogl-pipeline-opengl-private.h" #include "winsys/cogl-onscreen-glx.h" diff --git a/cogl/tests/conform/meson.build b/cogl/tests/conform/meson.build index 22d228208..708fc679d 100644 --- a/cogl/tests/conform/meson.build +++ b/cogl/tests/conform/meson.build @@ -1,6 +1,5 @@ cogl_test_conformance_sources = [ 'test-conform-main.c', - 'test-version.c', 'test-layer-remove.c', 'test-alpha-test.c', 'test-map-buffer-range.c', diff --git a/cogl/tests/conform/test-version.c b/cogl/tests/conform/test-version.c deleted file mode 100644 index afc87914a..000000000 --- a/cogl/tests/conform/test-version.c +++ /dev/null @@ -1,33 +0,0 @@ -#include - -#include "test-declarations.h" -#include "test-utils.h" -#include "cogl-config.h" - -/* So we can use _COGL_STATIC_ASSERT we include the internal - * cogl-util.h header. Since internal headers explicitly guard against - * applications including them directly instead of including - * we define __COGL_H_INSIDE__ here to subvert those - * guards in this case... */ -#define __COGL_H_INSIDE__ -#include -#undef __COGL_H_INSIDE__ - -_COGL_STATIC_ASSERT (COGL_VERSION_GET_MAJOR (COGL_VERSION_ENCODE (100, - 200, - 300)) == - 100, - "Getting the major component out of a encoded version " - "does not work"); -_COGL_STATIC_ASSERT (COGL_VERSION_GET_MINOR (COGL_VERSION_ENCODE (100, - 200, - 300)) == - 200, - "Getting the minor component out of a encoded version " - "does not work"); -_COGL_STATIC_ASSERT (COGL_VERSION_GET_MICRO (COGL_VERSION_ENCODE (100, - 200, - 300)) == - 300, - "Getting the micro component out of a encoded version " - "does not work");