build: Move EGL-related files under egl/

Including the clutter-cex100.h.in header.

diff --git a/.gitignore b/.gitignore
index 76a32df..a9bec30 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,7 @@ stamp-marshal
 /clutter/clutter-version.h
 /clutter/gcov-report.txt
 /clutter/clutter-json.h
-/clutter/cogl/clutter-cex100.h
+/clutter/egl/clutter-cex100.h
 /build/autotools/*.m4
 !/build/autotools/introspection.m4
 !/build/autotools/as-linguas.m4

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 114ea3f..195cec5 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -524,8 +524,8 @@ EXTRA_DIST += \
 
 # EGL backend rules
 egl_source_h = \
-       $(srcdir)/cogl/clutter-egl-headers.h    \
-       $(srcdir)/cogl/clutter-egl.h            \
+       $(srcdir)/egl/clutter-egl-headers.h     \
+       $(srcdir)/egl/clutter-egl.h             \
        $(NULL)
 
 egl_tslib_c = $(srcdir)/tslib/clutter-event-tslib.c
@@ -541,7 +541,7 @@ evdev_h_priv = \
        $(srcdir)/evdev/clutter-input-device-evdev.h    \
        $(NULL)
 
-cex_h = cogl/clutter-cex100.h
+cex_h = egl/clutter-cex100.h
 BUILT_SOURCES += $(cex_h)
 EXTRA_DIST += $(srcdir)/$(cex_h).in
 

diff --git a/clutter/egl/clutter-cex100.h b/clutter/egl/clutter-cex100.h
deleted file mode 100644 (file)
index 452c4ab..0000000
--- a/clutter/egl/clutter-cex100.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Clutter.
- *
- * An OpenGL based 'interactive canvas' library.
- *
- * Copyright (C) 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/>.
- *
- * Authors:
- *   Damien Lespiau <damien.lespiau@intel.com>
- */
-
-/**
- * SECTION:clutter-cex100
- * @short_description: Intel CE3100, CE4100 Specific API
- *
- * The CEX100 backend for Clutter provides some Intel CE3100/CE4100
- * specific API
- *
- * You need to include
- * <filename class="headerfile">&lt;clutter/egl/clutter-cex100.h&gt;</filename>
- * to have access to the functions documented here.
- */
-
-#ifndef __CLUTTER_CEX100_H__
-#define __CLUTTER_CEX100_H__
-
-#include <glib.h>
-
-#include <libgdl.h>
-
-G_BEGIN_DECLS
-
-/**
- * clutter_cex100_set_plane:
- * @plane: a GDL plane
- *
- * Intel CE3100 and CE4100 have several planes (frame buffers) and a
- * hardware blender to blend the planes togeteher and produce the final
- * image.
- *
- * clutter_cex100_set_plane() let's you configure the GDL plane where
- * the stage will be drawn. By default Clutter will pick UPP_C
- * (GDL_PLANE_ID_UPP_C).
- *
- * <note>This function has to be called before clutter_init()</note>
- */
-void clutter_cex100_set_plane (gdl_plane_id_t plane);
-
-/**
- * ClutterCex100BufferingMode:
- * @CLUTTER_CEX100_DOUBLE_BUFFERING: The GDL plane will be double buffered
- * @CLUTTER_CEX100_TRIPLE_BUFFERING: The GDL plane will be triple buffered
- *
- * Enum passed to clutter_cex100_set_buffering_mode().
- */
-typedef enum /*< prefix=CLUTTER_CEX100 >*/
-{
-  CLUTTER_CEX100_DOUBLE_BUFFERING = 2,
-  CLUTTER_CEX100_TRIPLE_BUFFERING = 3
-} ClutterCex100BufferingMode;
-
-/**
- * clutter_cex100_set_buffering_mode:
- * @mode: a #ClutterCex100BufferingMode
- *
- * Configure the buffering mode of the underlying GDL plane. The GDL
- * surface used by Clutter to draw can be backed up by either one or two
- * back buffers thus being double or triple buffered, respectively.
- *
- * Clutter defaults to %CLUTTER_CEX100_TRIPLE_BUFFERING.
- *
- * <note>This function has to be called before clutter_init()</note>
- */
-void clutter_cex100_set_buffering_mode (ClutterCex100BufferingMode mode);
-
-G_END_DECLS
-
-#endif /* __CLUTTER_CEX100_H__ */

diff --git a/clutter/cogl/clutter-cex100.h.in b/clutter/egl/clutter-cex100.h.in
similarity index 100%
rename from clutter/cogl/clutter-cex100.h.in
rename to clutter/egl/clutter-cex100.h.in

diff --git a/clutter/cogl/clutter-egl-headers.h b/clutter/egl/clutter-egl-headers.h
similarity index 100%
rename from clutter/cogl/clutter-egl-headers.h
rename to clutter/egl/clutter-egl-headers.h

diff --git a/clutter/cogl/clutter-egl.h b/clutter/egl/clutter-egl.h
similarity index 100%
rename from clutter/cogl/clutter-egl.h
rename to clutter/egl/clutter-egl.h

diff --git a/configure.ac b/configure.ac
index e8febc4..b709ed2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -955,7 +955,7 @@ AC_CONFIG_FILES([
 
        clutter/cally/cally-$CLUTTER_API_VERSION.pc:clutter/cally/cally.pc.in
 
-       clutter/cogl/clutter-cex100.h
+       clutter/egl/clutter-cex100.h
 
        tests/Makefile
        tests/accessibility/Makefile