From 3450b51da11fc1dcf6db402fc3a3099d060a921d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 15 Jun 2016 18:40:11 -0400 Subject: [PATCH] cogl: Remove CoglClipState We were not using it anywhere; lets get rid of it. https://bugzilla.gnome.org/show_bug.cgi?id=768977 --- cogl/cogl/Makefile.am | 2 - cogl/cogl/cogl.h | 1 - cogl/cogl/deprecated/cogl-clip-state.c | 138 ------------- cogl/cogl/deprecated/cogl-clip-state.h | 266 ------------------------- 4 files changed, 407 deletions(-) delete mode 100644 cogl/cogl/deprecated/cogl-clip-state.c delete mode 100644 cogl/cogl/deprecated/cogl-clip-state.h diff --git a/cogl/cogl/Makefile.am b/cogl/cogl/Makefile.am index 2a643c791..3f3856e48 100644 --- a/cogl/cogl/Makefile.am +++ b/cogl/cogl/Makefile.am @@ -49,7 +49,6 @@ pkgconfig_DATA = $(pc_files) DISTCLEANFILES += $(pc_files) cogl_deprecated_h = \ - deprecated/cogl-clip-state.h \ deprecated/cogl-material-compat.h \ deprecated/cogl-vertex-buffer.h \ deprecated/cogl-shader.h \ @@ -382,7 +381,6 @@ cogl_sources_c = \ cogl-closure-list.c \ cogl-fence.c \ cogl-fence-private.h \ - deprecated/cogl-clip-state.c \ deprecated/cogl-vertex-buffer-private.h \ deprecated/cogl-vertex-buffer.c \ deprecated/cogl-material-compat.c \ diff --git a/cogl/cogl/cogl.h b/cogl/cogl/cogl.h index 1c0103a04..d71dd8aaa 100644 --- a/cogl/cogl/cogl.h +++ b/cogl/cogl/cogl.h @@ -80,7 +80,6 @@ */ #ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API #include -#include #include #include #include diff --git a/cogl/cogl/deprecated/cogl-clip-state.c b/cogl/cogl/deprecated/cogl-clip-state.c deleted file mode 100644 index 63013e8af..000000000 --- a/cogl/cogl/deprecated/cogl-clip-state.c +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2007,2008,2009,2010 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. - * - * - */ - -#ifdef HAVE_CONFIG_H -#include "cogl-config.h" -#endif - -#include -#include - -#include - -#include "cogl-clip-state.h" -#include "cogl-clip-stack.h" -#include "cogl-context-private.h" -#include "cogl-framebuffer-private.h" -#include "cogl-journal-private.h" -#include "cogl-util.h" -#include "cogl-matrix-private.h" -#include "cogl1-context.h" - -void -cogl_clip_push_window_rectangle (int x_offset, - int y_offset, - int width, - int height) -{ - cogl_framebuffer_push_scissor_clip (cogl_get_draw_framebuffer (), - x_offset, y_offset, width, height); -} - -/* XXX: This is deprecated API */ -void -cogl_clip_push_window_rect (float x_offset, - float y_offset, - float width, - float height) -{ - cogl_clip_push_window_rectangle (x_offset, y_offset, width, height); -} - -void -cogl_clip_push_rectangle (float x_1, - float y_1, - float x_2, - float y_2) -{ - cogl_framebuffer_push_rectangle_clip (cogl_get_draw_framebuffer (), - x_1, y_1, x_2, y_2); -} - -/* XXX: Deprecated API */ -void -cogl_clip_push (float x_offset, - float y_offset, - float width, - float height) -{ - cogl_clip_push_rectangle (x_offset, - y_offset, - x_offset + width, - y_offset + height); -} - -void -cogl_clip_push_primitive (CoglPrimitive *primitive, - float bounds_x1, - float bounds_y1, - float bounds_x2, - float bounds_y2) -{ - cogl_framebuffer_push_primitive_clip (cogl_get_draw_framebuffer (), - primitive, - bounds_x1, - bounds_y1, - bounds_x2, - bounds_y2); -} - -void -cogl_clip_pop (void) -{ - cogl_framebuffer_pop_clip (cogl_get_draw_framebuffer ()); -} - -void -cogl_clip_stack_save (void) -{ - /* This function was just used to temporarily switch the clip stack - * when using an offscreen buffer. This is no longer needed because - * each framebuffer maintains its own clip stack. The function is - * documented to do nothing since version 1.2 */ -} - -void -cogl_clip_stack_restore (void) -{ - /* Do nothing. See cogl_clip_stack_save() */ -} - -/* XXX: This should never have been made public API! */ -void -cogl_clip_ensure (void) -{ - /* Do nothing. - * - * This API shouldn't be used by anyone and the documented semantics - * are basically vague enough that we can get away with doing - * nothing here. - */ -} diff --git a/cogl/cogl/deprecated/cogl-clip-state.h b/cogl/cogl/deprecated/cogl-clip-state.h deleted file mode 100644 index 51091abe5..000000000 --- a/cogl/cogl/deprecated/cogl-clip-state.h +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Cogl - * - * A Low Level GPU Graphics and Utilities API - * - * Copyright (C) 2010,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. - * - * - */ - -#if !defined(__COGL_H_INSIDE__) && !defined(COGL_COMPILATION) -#error "Only can be included directly." -#endif - -#ifndef __COGL_CLIP_STATE_H__ -#define __COGL_CLIP_STATE_H__ - -#include -#include -#include - -COGL_BEGIN_DECLS - -/** - * SECTION:cogl-clipping - * @short_description: Fuctions for manipulating a stack of clipping regions - * - * To support clipping your geometry to rectangles or paths Cogl exposes a - * stack based API whereby each clip region you push onto the stack is - * intersected with the previous region. - */ - -/** - * cogl_clip_push_window_rectangle: - * @x_offset: left edge of the clip rectangle in window coordinates - * @y_offset: top edge of the clip rectangle in window coordinates - * @width: width of the clip rectangle - * @height: height of the clip rectangle - * - * Specifies a rectangular clipping area for all subsequent drawing - * operations. Any drawing commands that extend outside the rectangle - * will be clipped so that only the portion inside the rectangle will - * be displayed. The rectangle dimensions are not transformed by the - * current model-view matrix. - * - * The rectangle is intersected with the current clip region. To undo - * the effect of this function, call cogl_clip_pop(). - * - * Since: 1.2 - * Deprecated: 1.16: Use cogl_framebuffer_push_scissor_clip() instead - */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_scissor_clip) -void -cogl_clip_push_window_rectangle (int x_offset, - int y_offset, - int width, - int height); - -/** - * cogl_clip_push_window_rect: - * @x_offset: left edge of the clip rectangle in window coordinates - * @y_offset: top edge of the clip rectangle in window coordinates - * @width: width of the clip rectangle - * @height: height of the clip rectangle - * - * Specifies a rectangular clipping area for all subsequent drawing - * operations. Any drawing commands that extend outside the rectangle - * will be clipped so that only the portion inside the rectangle will - * be displayed. The rectangle dimensions are not transformed by the - * current model-view matrix. - * - * The rectangle is intersected with the current clip region. To undo - * the effect of this function, call cogl_clip_pop(). - * - * Deprecated: 1.16: Use cogl_framebuffer_push_scissor_clip() instead - */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_scissor_clip) -void -cogl_clip_push_window_rect (float x_offset, - float y_offset, - float width, - float height); - -/** - * cogl_clip_push_rectangle: - * @x0: x coordinate for top left corner of the clip rectangle - * @y0: y coordinate for top left corner of the clip rectangle - * @x1: x coordinate for bottom right corner of the clip rectangle - * @y1: y coordinate for bottom right corner of the clip rectangle - * - * Specifies a rectangular clipping area for all subsequent drawing - * operations. Any drawing commands that extend outside the rectangle - * will be clipped so that only the portion inside the rectangle will - * be displayed. The rectangle dimensions are transformed by the - * current model-view matrix. - * - * The rectangle is intersected with the current clip region. To undo - * the effect of this function, call cogl_clip_pop(). - * - * Since: 1.2 - * Deprecated: 1.16: Use cogl_framebuffer_push_rectangle_clip() - * instead - */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_rectangle_clip) -void -cogl_clip_push_rectangle (float x0, - float y0, - float x1, - float y1); - -/** - * cogl_clip_push: - * @x_offset: left edge of the clip rectangle - * @y_offset: top edge of the clip rectangle - * @width: width of the clip rectangle - * @height: height of the clip rectangle - * - * Specifies a rectangular clipping area for all subsequent drawing - * operations. Any drawing commands that extend outside the rectangle - * will be clipped so that only the portion inside the rectangle will - * be displayed. The rectangle dimensions are transformed by the - * current model-view matrix. - * - * The rectangle is intersected with the current clip region. To undo - * the effect of this function, call cogl_clip_pop(). - * - * Deprecated: 1.16: The x, y, width, height arguments are inconsistent - * with other API that specify rectangles in model space, and when used - * with a coordinate space that puts the origin at the center and y+ - * extending up, it's awkward to use. Please use - * cogl_framebuffer_push_rectangle_clip() - */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_rectangle_clip) -void -cogl_clip_push (float x_offset, - float y_offset, - float width, - float height); - -/** - * cogl_clip_push_primitive: - * @primitive: A #CoglPrimitive describing a flat 2D shape - * @bounds_x1: x coordinate for the top-left corner of the primitives - * bounds - * @bounds_y1: y coordinate for the top-left corner of the primitives - * bounds - * @bounds_x2: x coordinate for the bottom-right corner of the primitives - * bounds - * @bounds_y2: y coordinate for the bottom-right corner of the - * primitives bounds. - * - * Sets a new clipping area using a 2D shaped described with a - * #CoglPrimitive. The shape must not contain self overlapping - * geometry and must lie on a single 2D plane. A bounding box of the - * 2D shape in local coordinates (the same coordinates used to - * describe the shape) must be given. It is acceptable for the bounds - * to be larger than the true bounds but behaviour is undefined if the - * bounds are smaller than the true bounds. - * - * The primitive is transformed by the current model-view matrix and - * the silhouette is intersected with the previous clipping area. To - * restore the previous clipping area, call - * cogl_clip_pop(). - * - * Since: 1.10 - * Stability: unstable - * Deprecated: 1.16: Use cogl_framebuffer_push_primitive_clip() - * instead - */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_push_primitive_clip) -void -cogl_clip_push_primitive (CoglPrimitive *primitive, - float bounds_x1, - float bounds_y1, - float bounds_x2, - float bounds_y2); -/** - * cogl_clip_pop: - * - * Reverts the clipping region to the state before the last call to - * cogl_clip_push(). - * - * Deprecated: 1.16: Use cogl_framebuffer_pop_clip() instead - */ -COGL_DEPRECATED_IN_1_16_FOR (cogl_framebuffer_pop_clip) -void -cogl_clip_pop (void); - -/** - * cogl_clip_ensure: - * - * Ensures that the current clipping region has been set in GL. This - * will automatically be called before any Cogl primitives but it - * maybe be neccessary to call if you are using raw GL calls with - * clipping. - * - * Deprecated: 1.2: Calling this function has no effect - * - * Since: 1.0 - */ -COGL_DEPRECATED -void -cogl_clip_ensure (void); - -/** - * cogl_clip_stack_save: - * - * Save the entire state of the clipping stack and then clear all - * clipping. The previous state can be returned to with - * cogl_clip_stack_restore(). Each call to cogl_clip_push() after this - * must be matched by a call to cogl_clip_pop() before calling - * cogl_clip_stack_restore(). - * - * Deprecated: 1.2: This was originally added to allow us to save the - * clip stack when switching to an offscreen framebuffer, but it's - * not necessary anymore given that framebuffers now own separate - * clip stacks which will be automatically switched between when a - * new buffer is set. Calling this function has no effect - * - * Since: 0.8.2 - */ -COGL_DEPRECATED -void -cogl_clip_stack_save (void); - -/** - * cogl_clip_stack_restore: - * - * Restore the state of the clipping stack that was previously saved - * by cogl_clip_stack_save(). - * - * Deprecated: 1.2: This was originally added to allow us to restore - * the clip stack when switching back from an offscreen framebuffer, - * but it's not necessary anymore given that framebuffers now own - * separate clip stacks which will be automatically switched between - * when a new buffer is set. Calling this function has no effect - * - * Since: 0.8.2 - */ -COGL_DEPRECATED -void -cogl_clip_stack_restore (void); - -COGL_END_DECLS - -#endif /* __COGL_CLIP_STATE_H__ */