61c6c24dfa
* clutter/cogl/gl/cogl.c: (cogl_check_extension):
Actually populate this func and remove the static alternate
named one. Means GLX actually checks for available extensions.
Other minor tidy ups.
* clutter/glx/clutter-backend-glx.c:
* clutter/glx/clutter-backend-glx.h:
Add support for GLX_SGI_swap_control to do vblanking prefering
over glXGetVideoSyncSGI. Should fix issues on Intel chips with
very slow frame rates due to vblank problems.
Thanks to Michel Danzer for tips, see;
http://bugs.freedesktop.org/show_bug.cgi?id=10542
* test/test-actors.c:
Change FPS to 60.
109 lines
3.3 KiB
C
109 lines
3.3 KiB
C
/* Clutter.
|
|
* An OpenGL based 'interactive canvas' library.
|
|
* Authored By Matthew Allum <mallum@openedhand.com>
|
|
* Copyright (C) 2006-2007 OpenedHand
|
|
*
|
|
* 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, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __CLUTTER_BACKEND_GLX_H__
|
|
#define __CLUTTER_BACKEND_GLX_H__
|
|
|
|
#include <glib-object.h>
|
|
#include <clutter/clutter-event.h>
|
|
#include <clutter/clutter-backend.h>
|
|
#include <X11/Xlib.h>
|
|
#include <X11/Xatom.h>
|
|
#include <GL/glx.h>
|
|
#include <GL/gl.h>
|
|
|
|
#include "clutter-glx.h"
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define CLUTTER_TYPE_BACKEND_GLX (clutter_backend_glx_get_type ())
|
|
#define CLUTTER_BACKEND_GLX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_BACKEND_GLX, ClutterBackendGLX))
|
|
#define CLUTTER_IS_BACKEND_GLX(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_BACKEND_GLX))
|
|
#define CLUTTER_BACKEND_GLX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_BACKEND_GLX, ClutterBackendGLXClass))
|
|
#define CLUTTER_IS_BACKEND_GLX_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_BACKEND_GLX))
|
|
#define CLUTTER_BACKEND_GLX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_BACKEND_GLX, ClutterBackendGLXClass))
|
|
|
|
typedef struct _ClutterBackendGLX ClutterBackendGLX;
|
|
typedef struct _ClutterBackendGLXClass ClutterBackendGLXClass;
|
|
|
|
typedef enum ClutterGLXVBlankType
|
|
{
|
|
CLUTTER_VBLANK_NONE = 0,
|
|
CLUTTER_VBLANK_GLX_SWAP,
|
|
CLUTTER_VBLANK_GLX,
|
|
CLUTTER_VBLANK_DRI
|
|
|
|
} ClutterGLXVBlankType;
|
|
|
|
typedef int (*GetVideoSyncProc) (unsigned int *count);
|
|
typedef int (*WaitVideoSyncProc) (int divisor,
|
|
int remainder,
|
|
unsigned int *count);
|
|
typedef int (*SwapIntervalProc) (int interval);
|
|
|
|
typedef struct _ClutterGLXEventFilter
|
|
{
|
|
ClutterGLXFilterFunc func;
|
|
gpointer data;
|
|
|
|
} ClutterGLXEventFilter;
|
|
|
|
struct _ClutterBackendGLX
|
|
{
|
|
ClutterBackend parent_instance;
|
|
|
|
Display *xdpy;
|
|
Window xwin_root;
|
|
Screen *xscreen;
|
|
int xscreen_num;
|
|
gchar *display_name;
|
|
|
|
/* main stage singleton */
|
|
ClutterActor *stage;
|
|
|
|
/* event source */
|
|
GSource *event_source;
|
|
GSList *event_filters;
|
|
|
|
/* Vblank stuff */
|
|
GetVideoSyncProc get_video_sync;
|
|
WaitVideoSyncProc wait_video_sync;
|
|
SwapIntervalProc swap_interval;
|
|
gint dri_fd;
|
|
ClutterGLXVBlankType vblank_type;
|
|
};
|
|
|
|
struct _ClutterBackendGLXClass
|
|
{
|
|
ClutterBackendClass parent_class;
|
|
};
|
|
|
|
void _clutter_backend_glx_events_init (ClutterBackend *backend);
|
|
void _clutter_backend_glx_events_uninit (ClutterBackend *backend);
|
|
|
|
void clutter_backend_glx_wait_for_vblank (ClutterBackendGLX *backend_glx);
|
|
|
|
GType clutter_backend_glx_get_type (void) G_GNUC_CONST;
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* __CLUTTER_BACKEND_GLX_H__ */
|