diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-05 14:40:19 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-12-05 17:17:26 +0000 |
| commit | 3edf369eade8b587aeaa162bd3bbeb3546c35b84 (patch) | |
| tree | f9d853e3c754894a3fe4d55a4978cd12d2d3c83b | |
| parent | 934a3dcc6b218056b685885ef7d373578378caf5 (diff) | |
gl: Make the backend struct static
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/cairo-gl-private.h | 2 | ||||
| -rw-r--r-- | src/cairo-gl-surface.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/cairo-gl-private.h b/src/cairo-gl-private.h index 77b58ad6..e508714c 100644 --- a/src/cairo-gl-private.h +++ b/src/cairo-gl-private.h @@ -342,8 +342,6 @@ typedef struct _cairo_gl_font { cairo_list_t link; } cairo_gl_font_t; -cairo_private extern const cairo_surface_backend_t _cairo_gl_surface_backend; - static cairo_always_inline GLenum _cairo_gl_get_error (void) { diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c index 3a3a09d2..82bb2f02 100644 --- a/src/cairo-gl-surface.c +++ b/src/cairo-gl-surface.c @@ -49,6 +49,8 @@ #include "cairo-image-surface-private.h" #include "cairo-surface-backend-private.h" +static const cairo_surface_backend_t _cairo_gl_surface_backend; + static cairo_status_t _cairo_gl_surface_flush (void *abstract_surface); @@ -379,6 +381,8 @@ _cairo_gl_surface_init (cairo_device_t *device, cairo_content_t content, int width, int height) { + assert (width > 0 && height > 0); + _cairo_surface_init (&surface->base, &_cairo_gl_surface_backend, device, @@ -401,7 +405,6 @@ _cairo_gl_surface_create_scratch_for_texture (cairo_gl_context_t *ctx, cairo_gl_surface_t *surface; assert (width <= ctx->max_framebuffer_size && height <= ctx->max_framebuffer_size); - surface = calloc (1, sizeof (cairo_gl_surface_t)); if (unlikely (surface == NULL)) return _cairo_surface_create_in_error (_cairo_error (CAIRO_STATUS_NO_MEMORY)); @@ -1233,7 +1236,7 @@ _cairo_gl_surface_glyphs (void *surface, clip); } -const cairo_surface_backend_t _cairo_gl_surface_backend = { +static const cairo_surface_backend_t _cairo_gl_surface_backend = { CAIRO_SURFACE_TYPE_GL, _cairo_gl_surface_finish, _cairo_default_context_create, |