diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-21 22:28:44 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-07-21 22:28:44 +0100 |
| commit | 1ae5942a3aa9f73aa71438dc40221836b0dff7e2 (patch) | |
| tree | a39297460aaaf3b88c4b26480d12b40ec4eed545 /src/cairo.h | |
| parent | fd9df4978d56bbb85ecd795afce72c0310dbcf3f (diff) | |
| parent | 6a5957475139a7c80a6bb55fb63927e5ec8866f6 (diff) | |
Merge commit 'anholt/gl'
Conflicts:
boilerplate/Makefile.sources
boilerplate/cairo-boilerplate.c
build/configure.ac.features
src/cairo.h
util/cairo-script/Makefile.am
Diffstat (limited to 'src/cairo.h')
| -rw-r--r-- | src/cairo.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/cairo.h b/src/cairo.h index 48ecc37b..bd4eb661 100644 --- a/src/cairo.h +++ b/src/cairo.h @@ -1943,6 +1943,7 @@ cairo_surface_status (cairo_surface_t *surface); * @CAIRO_SURFACE_TYPE_QT: The surface is of type Qt, since 1.10 * @CAIRO_SURFACE_TYPE_META: The surface is a meta-type, since 1.10 * @CAIRO_SURFACE_TYPE_VG: The surface is a OpenVG surface, since 1.10 + * @CAIRO_SURFACE_TYPE_GL: The surface is of type OpenGL, since 1.10 * * #cairo_surface_type_t is used to describe the type of a given * surface. The surface types are also known as "backends" or "surface @@ -1985,7 +1986,8 @@ typedef enum _cairo_surface_type { CAIRO_SURFACE_TYPE_SCRIPT, CAIRO_SURFACE_TYPE_QT, CAIRO_SURFACE_TYPE_META, - CAIRO_SURFACE_TYPE_VG + CAIRO_SURFACE_TYPE_VG, + CAIRO_SURFACE_TYPE_GL, } cairo_surface_type_t; cairo_public cairo_surface_type_t |