mirror of
https://github.com/brl/mutter.git
synced 2024-12-01 20:30:41 -05:00
ae9cd7ca01
There used to be a function called cogl_clip_stack_save in the public API which was used when temporarily switching to an offscreen buffer to save the clip state. This is no longer necessary because each framebuffer has its own clip stack anyway so the function was removed in master. However the code to maintain the stack of stacks was retained. This patch removes it in an effort to simplify the code. On the 1.18 branch this function is deprecated and the documentation says that it does nothing. However that is incorrect because it does actually the push clip stack. I think it would be safe to backport this patch to the 1.18 branch and actually make it do nothing like it is documented to do. https://bugzilla.gnome.org/show_bug.cgi?id=719546 (cherry picked from commit 8655027fdcf03b02fcbbb02d179a0a88ed79c5b3) This patch has some extra changes while backporting to the 1.18 branch. Here the cogl-clip-state file still contained some deprecated functions. Instead of deleting the file completely it has been moved to the deprecated folder. The declarations for this functions have been moved from cogl1-context.h to a new deprecated/cogl-clip-state.h header. Conflicts: cogl/Makefile.am cogl/cogl-clip-state.c Reviewed-by: Robert Bragg <robert@linux.intel.com>
133 lines
3.7 KiB
C
133 lines
3.7 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2007,2008,2009,2010 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
|
|
|
|
#include <string.h>
|
|
#include <math.h>
|
|
|
|
#include <glib.h>
|
|
|
|
#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"
|
|
#include "cogl-path/cogl-path.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.
|
|
*/
|
|
}
|