diff options
| author | Matthew Allum <mallum@openedhand.com> | 2007-01-23 20:29:11 +0000 |
|---|---|---|
| committer | Matthew Allum <mallum@openedhand.com> | 2007-01-23 20:29:11 +0000 |
| commit | 244cacd14bb89295ea3775afd8cedea634cbc112 (patch) | |
| tree | 21700084f31f2957d9f64fecaf26760a2792457c /clutter/clutter-main.h | |
| parent | 685c583d51d21c403947e02191a43cbe923a664e (diff) | |
| download | clutter-244cacd14bb89295ea3775afd8cedea634cbc112.tar.gz | |
2007-01-23 Matthew Allum <mallum@openedhand.com>
* Makefile.am:
* clutter.pc.in:
* clutter/Makefile.am:
* clutter/clutter-backend-glx.c:
* clutter/clutter-backend-glx.h:
* clutter/clutter-event.c:
* clutter/clutter-feature.c:
* clutter/clutter-group.c:
* clutter/clutter-main.c:
* clutter/clutter-main.h:
* clutter/clutter-private.h:
* clutter/clutter-stage-glx.c:
* clutter/clutter-stage-glx.h:
* clutter/clutter-stage.c:
* clutter/clutter-stage.h:
* clutter/clutter-util.c:
* clutter/clutter-util.h:
* clutter/pango/pangoclutter-render.c:
* configure.ac:
* examples/Makefile.am:
Initial work in supporting different GL backends (ie. GLX/EGL/DirectFB etc).
Currently just GLX supported and now mostly self contained.
* TODO:
Add a note about caching glenables
Diffstat (limited to 'clutter/clutter-main.h')
| -rw-r--r-- | clutter/clutter-main.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h index 51f7211d8..8ffc2fec9 100644 --- a/clutter/clutter-main.h +++ b/clutter/clutter-main.h @@ -29,11 +29,6 @@ #include <clutter/clutter-actor.h> #include <clutter/clutter-stage.h> -#include <X11/Xlib.h> - -#include <GL/glx.h> -#include <GL/gl.h> - G_BEGIN_DECLS #define CLUTTER_INIT_ERROR (clutter_init_error_quark ()) @@ -42,7 +37,7 @@ typedef enum { CLUTTER_INIT_SUCCESS = 1, CLUTTER_INIT_ERROR_UNKOWN = 0, CLUTTER_INIT_ERROR_THREADS = -1, - CLUTTER_INIT_ERROR_DISPLAY = -2, + CLUTTER_INIT_ERROR_BACKEND = -2, CLUTTER_INIT_ERROR_INTERNAL = -3, CLUTTER_INIT_ERROR_OPENGL = -4 } ClutterInitError; @@ -64,10 +59,8 @@ void clutter_main (void); void clutter_main_quit (void); gint clutter_main_level (void); void clutter_redraw (void); -Display * clutter_xdisplay (void); -gint clutter_xscreen (void); -Window clutter_root_xwindow (void); gboolean clutter_want_debug (void); +gboolean clutter_want_fps (void); void clutter_threads_enter (void); void clutter_threads_leave (void); |