mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 11:32:04 +00:00
24412798dc
This reverts commit bc41489336.
The reason this was causing problems for Clutter is that it defines
COGL_ENABLE_EXPERIMENTAL_2_0_API which is meant to cause the Cogl
headers not to declare the deprecated API. The reverted patch moved
some additional clipping API to a deprecated header which was
previously being used by Clutter. Clutter was still successfully
compiling but with some warnings for the missing function
declarations. However when the binary is run the clipping would get
completely messed up because it would assume all of the arguments to
the functions are integers instead of floats and the wrong values
would be passed.
Clutter now has commit to make it use the 2.0 API instead of the
deprecated functions so the revert is no longer necessary.
https://git.gnome.org/browse/clutter/commit?id=705640367a5c2ae21405806bfa
Reviewed-by: Robert Bragg <robert@linux.intel.com>
181 lines
5.2 KiB
C
181 lines
5.2 KiB
C
/*
|
|
* Cogl
|
|
*
|
|
* An object oriented GL/GLES Abstraction/Utility Layer
|
|
*
|
|
* Copyright (C) 2008,2009 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/>.
|
|
*
|
|
*
|
|
*/
|
|
|
|
#ifndef __COGL_H__
|
|
#define __COGL_H__
|
|
|
|
#ifdef COGL_COMPILATION
|
|
#error "<cogl/cogl.h> shouldn't be included internally"
|
|
#endif
|
|
|
|
/* Note: When building Cogl .gir we explicitly define
|
|
* __COGL_H_INSIDE__ */
|
|
#ifndef __COGL_H_INSIDE__
|
|
#define __COGL_H_INSIDE__
|
|
#define __COGL_MUST_UNDEF_COGL_H_INSIDE__
|
|
#endif
|
|
|
|
#ifdef COGL_ENABLE_EXPERIMENTAL_2_0_API
|
|
#ifndef COGL_ENABLE_EXPERIMENTAL_API
|
|
#define COGL_ENABLE_EXPERIMENTAL_API
|
|
#endif
|
|
#endif
|
|
|
|
/* We currently keep gtype integration delimited in case we eventually
|
|
* want to split it out into a separate utility library when Cogl
|
|
* becomes a standalone project. (like cairo-gobject.so)
|
|
*/
|
|
#define _COGL_SUPPORTS_GTYPE_INTEGRATION
|
|
|
|
/*
|
|
* API common to the 1.x and 2.0 api...
|
|
*/
|
|
|
|
#include <cogl/cogl-defines.h>
|
|
#include <cogl/cogl-macros.h>
|
|
|
|
#include <cogl/cogl-error.h>
|
|
|
|
#include <cogl/cogl-object.h>
|
|
#include <cogl/cogl1-context.h>
|
|
#include <cogl/cogl-bitmap.h>
|
|
#include <cogl/cogl-color.h>
|
|
#include <cogl/cogl-matrix.h>
|
|
#include <cogl/cogl-matrix-stack.h>
|
|
#include <cogl/cogl-offscreen.h>
|
|
#include <cogl/cogl-primitives.h>
|
|
#include <cogl/cogl-texture.h>
|
|
#include <cogl/cogl-types.h>
|
|
#include <cogl/cogl-version.h>
|
|
|
|
/*
|
|
* 1.x only api...
|
|
*/
|
|
#ifndef COGL_ENABLE_EXPERIMENTAL_2_0_API
|
|
#include <cogl/cogl-enum-types.h>
|
|
#include <cogl/deprecated/cogl-clip-state.h>
|
|
#include <cogl/deprecated/cogl-vertex-buffer.h>
|
|
#include <cogl/deprecated/cogl-fixed.h>
|
|
#include <cogl/deprecated/cogl-material-compat.h>
|
|
#include <cogl/deprecated/cogl-shader.h>
|
|
#endif
|
|
|
|
/* It would be good to move these casts up into 1.x only api if we can
|
|
* update Clutter, Mutter and GnomeShell to avoid redundant casts when
|
|
* they enable the experimental api... */
|
|
#include <cogl/deprecated/cogl-type-casts.h>
|
|
|
|
/*
|
|
* 2.0 api that's compatible with the 1.x api...
|
|
*/
|
|
#if defined (COGL_ENABLE_EXPERIMENTAL_API)
|
|
#include <cogl/cogl-swap-chain.h>
|
|
#include <cogl/cogl-renderer.h>
|
|
#include <cogl/cogl-output.h>
|
|
#include <cogl/cogl-display.h>
|
|
#include <cogl/cogl-context.h>
|
|
#include <cogl/cogl-buffer.h>
|
|
#include <cogl/cogl-pixel-buffer.h>
|
|
#include <cogl/cogl-vector.h>
|
|
#include <cogl/cogl-euler.h>
|
|
#include <cogl/cogl-quaternion.h>
|
|
#include <cogl/cogl-texture-2d.h>
|
|
#include <cogl/cogl-texture-2d-gl.h>
|
|
#include <cogl/cogl-texture-rectangle.h>
|
|
#include <cogl/cogl-texture-3d.h>
|
|
#include <cogl/cogl-texture-2d-sliced.h>
|
|
#include <cogl/cogl-sub-texture.h>
|
|
#include <cogl/cogl-atlas-texture.h>
|
|
#include <cogl/cogl-meta-texture.h>
|
|
#include <cogl/cogl-primitive-texture.h>
|
|
#include <cogl/cogl-index-buffer.h>
|
|
#include <cogl/cogl-attribute-buffer.h>
|
|
#include <cogl/cogl-indices.h>
|
|
#include <cogl/cogl-attribute.h>
|
|
#include <cogl/cogl-primitive.h>
|
|
#include <cogl/cogl-depth-state.h>
|
|
#include <cogl/cogl-pipeline.h>
|
|
#include <cogl/cogl-pipeline-state.h>
|
|
#include <cogl/cogl-pipeline-layer-state.h>
|
|
#include <cogl/cogl-snippet.h>
|
|
#include <cogl/cogl-framebuffer.h>
|
|
#include <cogl/cogl-onscreen.h>
|
|
#include <cogl/cogl-frame-info.h>
|
|
#include <cogl/cogl-poll.h>
|
|
#include <cogl/cogl-fence.h>
|
|
#if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
|
|
#include <cogl/cogl-kms-renderer.h>
|
|
#include <cogl/cogl-kms-display.h>
|
|
#endif
|
|
#ifdef COGL_HAS_WIN32_SUPPORT
|
|
#include <cogl/cogl-win32-renderer.h>
|
|
#endif
|
|
#ifdef COGL_HAS_GLIB_SUPPORT
|
|
#include <cogl/cogl-glib-source.h>
|
|
#endif
|
|
/* XXX: This will definitly go away once all the Clutter winsys
|
|
* code has been migrated down into Cogl! */
|
|
#include <cogl/deprecated/cogl-clutter.h>
|
|
#endif
|
|
#ifdef COGL_HAS_SDL_SUPPORT
|
|
#include <cogl/cogl-sdl.h>
|
|
#endif
|
|
|
|
/*
|
|
* API deprecations
|
|
*/
|
|
#include <cogl/cogl-deprecated.h>
|
|
|
|
/*
|
|
* Cogl Path api compatability
|
|
*
|
|
* The cogl_path_ api used to be part of the core Cogl api so for
|
|
* compatability we include cogl-path.h via cogl.h
|
|
*/
|
|
#if defined (COGL_HAS_COGL_PATH_SUPPORT)
|
|
#include <cogl-path/cogl-path.h>
|
|
#endif
|
|
|
|
/**
|
|
* SECTION:cogl
|
|
* @short_description: General purpose API
|
|
*
|
|
* General utility functions for COGL.
|
|
*/
|
|
|
|
/* The gobject introspection scanner seems to parse public headers in
|
|
* isolation which means we need to be extra careful about how we
|
|
* define and undefine __COGL_H_INSIDE__ used to detect when internal
|
|
* headers are incorrectly included by developers. In the gobject
|
|
* introspection case we have to manually define __COGL_H_INSIDE__ as
|
|
* a commandline argument for the scanner which means we must be
|
|
* careful not to undefine it in a header...
|
|
*/
|
|
#ifdef __COGL_MUST_UNDEF_COGL_H_INSIDE__
|
|
#undef __COGL_H_INSIDE__
|
|
#undef __COGL_MUST_UNDEF_COGL_H_INSIDE__
|
|
#endif
|
|
|
|
#endif /* __COGL_H__ */
|