mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-05-04 14:08:29 +02:00
Drop cairo-vg surface
OpenVG is a failed experiment from 10 years ago, and nobody has been using the cairo-vg surface in pretty much the same amount of time.
This commit is contained in:
parent
fc3437128d
commit
9b9028c160
15 changed files with 0 additions and 2463 deletions
|
|
@ -32,4 +32,3 @@ cairo_boilerplate_win32_sources = cairo-boilerplate-win32.c cairo-boilerplate-wi
|
|||
cairo_boilerplate_xcb_sources = cairo-boilerplate-xcb.c
|
||||
cairo_boilerplate_xlib_headers = cairo-boilerplate-xlib.h
|
||||
cairo_boilerplate_xlib_sources = cairo-boilerplate-xlib.c
|
||||
cairo_boilerplate_vg_sources = cairo-boilerplate-vg.c
|
||||
|
|
|
|||
|
|
@ -157,16 +157,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_glesv3_private)
|
|||
enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glesv3_sources)
|
||||
endif
|
||||
|
||||
unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
|
||||
all_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
|
||||
all_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
|
||||
all_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
|
||||
ifeq ($(CAIRO_HAS_VG_SURFACE),1)
|
||||
enabled_cairo_boilerplate_headers += $(cairo_boilerplate_vg_headers)
|
||||
enabled_cairo_boilerplate_private += $(cairo_boilerplate_vg_private)
|
||||
enabled_cairo_boilerplate_sources += $(cairo_boilerplate_vg_sources)
|
||||
endif
|
||||
|
||||
supported_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
|
||||
all_cairo_boilerplate_headers += $(cairo_boilerplate_egl_headers)
|
||||
all_cairo_boilerplate_private += $(cairo_boilerplate_egl_private)
|
||||
|
|
|
|||
|
|
@ -1,364 +0,0 @@
|
|||
/* Cairo - a vector graphics library with display and print output
|
||||
*
|
||||
* Copyright © 2009 Chris Wilson
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it either under the terms of the GNU Lesser General Public
|
||||
* License version 2.1 as published by the Free Software Foundation
|
||||
* (the "LGPL") or, at your option, under the terms of the Mozilla
|
||||
* Public License Version 1.1 (the "MPL"). If you do not alter this
|
||||
* notice, a recipient may use your version of this file under either
|
||||
* the MPL or the LGPL.
|
||||
*
|
||||
* You should have received a copy of the LGPL along with this library
|
||||
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
|
||||
* You should have received a copy of the MPL along with this library
|
||||
* in the file COPYING-MPL-1.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
|
||||
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
|
||||
* the specific language governing rights and limitations.
|
||||
*
|
||||
* The Original Code is the cairo graphics library.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Chris Wilson.
|
||||
*/
|
||||
|
||||
#include "cairo-boilerplate-private.h"
|
||||
#include "cairo-malloc-private.h"
|
||||
|
||||
#include <cairo-vg.h>
|
||||
|
||||
/* XXX Not sure how to handle library specific context initialization */
|
||||
//#define USE_SHIVA
|
||||
//#define USE_AMANITH
|
||||
|
||||
#if CAIRO_HAS_GLX_FUNCTIONS
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <GL/glx.h>
|
||||
|
||||
typedef struct _vg_closure {
|
||||
Display *dpy;
|
||||
int screen;
|
||||
Window win;
|
||||
|
||||
GLXContext ctx;
|
||||
cairo_surface_t *surface;
|
||||
} vg_closure_glx_t;
|
||||
|
||||
static void
|
||||
_cairo_boilerplate_vg_cleanup_glx (void *closure)
|
||||
{
|
||||
vg_closure_glx_t *vgc = closure;
|
||||
|
||||
#ifdef USE_AMANITH
|
||||
vgDestroyContextAM ();
|
||||
#endif
|
||||
#ifdef USE_SHIVA
|
||||
vgDestroyContextSH ();
|
||||
#endif
|
||||
|
||||
glXDestroyContext (vgc->dpy, vgc->ctx);
|
||||
XDestroyWindow (vgc->dpy, vgc->win);
|
||||
XCloseDisplay (vgc->dpy);
|
||||
free (vgc);
|
||||
}
|
||||
|
||||
static cairo_surface_t *
|
||||
_cairo_boilerplate_vg_create_surface_glx (const char *name,
|
||||
cairo_content_t content,
|
||||
double width,
|
||||
double height,
|
||||
double max_width,
|
||||
double max_height,
|
||||
cairo_boilerplate_mode_t mode,
|
||||
void **closure)
|
||||
{
|
||||
int rgba_attribs[] = {
|
||||
GLX_RGBA,
|
||||
GLX_RED_SIZE, 1,
|
||||
GLX_GREEN_SIZE, 1,
|
||||
GLX_BLUE_SIZE, 1,
|
||||
GLX_ALPHA_SIZE, 1,
|
||||
GLX_DOUBLEBUFFER,
|
||||
GLX_NONE
|
||||
};
|
||||
int rgb_attribs[] = {
|
||||
GLX_RGBA,
|
||||
GLX_RED_SIZE, 1,
|
||||
GLX_GREEN_SIZE, 1,
|
||||
GLX_BLUE_SIZE, 1,
|
||||
GLX_DOUBLEBUFFER,
|
||||
GLX_NONE
|
||||
};
|
||||
XVisualInfo *vi;
|
||||
Display *dpy;
|
||||
Colormap cmap;
|
||||
XSetWindowAttributes swa;
|
||||
cairo_surface_t *surface;
|
||||
cairo_vg_context_t *context;
|
||||
vg_closure_glx_t *vgc;
|
||||
|
||||
vgc = _cairo_malloc (sizeof (vg_closure_glx_t));
|
||||
*closure = vgc;
|
||||
|
||||
if (width == 0)
|
||||
width = 1;
|
||||
if (height == 0)
|
||||
height = 1;
|
||||
|
||||
dpy = XOpenDisplay (NULL);
|
||||
vgc->dpy = dpy;
|
||||
if (vgc->dpy == NULL) {
|
||||
fprintf (stderr, "Failed to open display: %s\n", XDisplayName(0));
|
||||
free (vgc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (content == CAIRO_CONTENT_COLOR)
|
||||
vi = glXChooseVisual (dpy, DefaultScreen (dpy), rgb_attribs);
|
||||
else
|
||||
vi = glXChooseVisual (dpy, DefaultScreen (dpy), rgba_attribs);
|
||||
|
||||
if (vi == NULL) {
|
||||
fprintf (stderr, "Failed to create RGB, double-buffered visual\n");
|
||||
XCloseDisplay (dpy);
|
||||
free (vgc);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
vgc->ctx = glXCreateContext (dpy, vi, NULL, True);
|
||||
cmap = XCreateColormap (dpy,
|
||||
RootWindow (dpy, vi->screen),
|
||||
vi->visual,
|
||||
AllocNone);
|
||||
swa.colormap = cmap;
|
||||
swa.border_pixel = 0;
|
||||
vgc->win = XCreateWindow (dpy, RootWindow (dpy, vi->screen),
|
||||
-1, -1, 1, 1, 0,
|
||||
vi->depth,
|
||||
InputOutput,
|
||||
vi->visual,
|
||||
CWBorderPixel | CWColormap, &swa);
|
||||
XFreeColormap (dpy, cmap);
|
||||
XFree (vi);
|
||||
|
||||
XMapWindow (dpy, vgc->win);
|
||||
|
||||
/* we need an active context to initialise VG */
|
||||
glXMakeContextCurrent (dpy, vgc->win, vgc->win, vgc->ctx);
|
||||
|
||||
#ifdef USE_AMANITH
|
||||
vgInitContextAM (width, height, VG_FALSE, VG_TRUE);
|
||||
#endif
|
||||
#ifdef USE_SHIVA
|
||||
vgCreateContextSH (width, height);
|
||||
#endif
|
||||
|
||||
context = cairo_vg_context_create_for_glx (dpy, vgc->ctx);
|
||||
vgc->surface = cairo_vg_surface_create (context, content, width, height);
|
||||
cairo_vg_context_destroy (context);
|
||||
|
||||
surface = vgc->surface;
|
||||
if (cairo_surface_status (surface))
|
||||
_cairo_boilerplate_vg_cleanup_glx (vgc);
|
||||
|
||||
return surface;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if CAIRO_HAS_EGL_FUNCTIONS
|
||||
typedef struct _vg_closure_egl {
|
||||
EGLDisplay *dpy;
|
||||
EGLContext *ctx;
|
||||
EGLSurface *dummy;
|
||||
} vg_closure_egl_t;
|
||||
|
||||
static void
|
||||
_cairo_boilerplate_vg_cleanup_egl (void *closure)
|
||||
{
|
||||
vg_closure_egl_t *vgc = closure;
|
||||
|
||||
#ifdef USE_AMANITH
|
||||
vgDestroyContextAM ();
|
||||
#endif
|
||||
#ifdef USE_SHIVA
|
||||
vgDestroyContextSH ();
|
||||
#endif
|
||||
|
||||
eglDestroyContext (vgc->dpy, vgc->ctx);
|
||||
eglDestroySurface (vgc->dpy, vgc->dummy);
|
||||
eglTerminate (vgc->dpy);
|
||||
free (vgc);
|
||||
}
|
||||
|
||||
static cairo_surface_t *
|
||||
_cairo_boilerplate_vg_create_surface_egl (const char *name,
|
||||
cairo_content_t content,
|
||||
double width,
|
||||
double height,
|
||||
double max_width,
|
||||
double max_height,
|
||||
cairo_boilerplate_mode_t mode,
|
||||
void **closure)
|
||||
{
|
||||
int rgba_attribs[] = {
|
||||
EGL_RED_SIZE, 8,
|
||||
EGL_GREEN_SIZE, 8,
|
||||
EGL_BLUE_SIZE, 8,
|
||||
EGL_ALPHA_SIZE, 8,
|
||||
EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
|
||||
EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT,
|
||||
EGL_NONE
|
||||
};
|
||||
int rgb_attribs[] = {
|
||||
EGL_RED_SIZE, 8,
|
||||
EGL_GREEN_SIZE, 8,
|
||||
EGL_BLUE_SIZE, 8,
|
||||
EGL_ALPHA_SIZE, 8,
|
||||
EGL_VG_ALPHA_FORMAT, EGL_VG_ALPHA_FORMAT_PRE_BIT,
|
||||
EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
|
||||
EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT,
|
||||
EGL_NONE
|
||||
};
|
||||
int dummy_attribs[] = {
|
||||
EGL_WIDTH, 8, EGL_HEIGHT, 8,
|
||||
EGL_NONE
|
||||
};
|
||||
EGLDisplay *dpy;
|
||||
int major, minor;
|
||||
EGLConfig config;
|
||||
int num_configs;
|
||||
EGLContext *egl_context;
|
||||
EGLSurface *dummy;
|
||||
cairo_vg_context_t *context;
|
||||
cairo_surface_t *surface;
|
||||
vg_closure_egl_t *vgc;
|
||||
|
||||
dpy = eglGetDisplay (EGL_DEFAULT_DISPLAY);
|
||||
|
||||
if (! eglInitialize (dpy, &major, &minor))
|
||||
return NULL;
|
||||
|
||||
eglBindAPI (EGL_OPENVG_API);
|
||||
|
||||
if (! eglChooseConfig (dpy,
|
||||
content == CAIRO_CONTENT_COLOR_ALPHA ?
|
||||
rgba_attribs : rgb_attribs,
|
||||
&config, 1, &num_configs) ||
|
||||
num_configs != 1)
|
||||
{
|
||||
return NULL;
|
||||
}
|
||||
|
||||
egl_context = eglCreateContext (dpy, config, NULL, NULL);
|
||||
if (egl_context == NULL)
|
||||
return NULL;
|
||||
|
||||
/* Create a dummy surface in order to enable a context to initialise VG */
|
||||
dummy = eglCreatePbufferSurface (dpy, config, dummy_attribs);
|
||||
if (dummy == NULL)
|
||||
return NULL;
|
||||
if (! eglMakeCurrent (dpy, dummy, dummy, egl_context))
|
||||
return NULL;
|
||||
|
||||
#ifdef USE_AMANITH
|
||||
vgInitContextAM (width, height, VG_FALSE, VG_TRUE);
|
||||
#endif
|
||||
#ifdef USE_SHIVA
|
||||
vgCreateContextSH (width, height);
|
||||
#endif
|
||||
|
||||
vgc = xmalloc (sizeof (vg_closure_egl_t));
|
||||
vgc->dpy = dpy;
|
||||
vgc->ctx = egl_context;
|
||||
vgc->dummy = dummy;
|
||||
*closure = vgc;
|
||||
|
||||
context = cairo_vg_context_create_for_egl (vgc->dpy, vgc->ctx);
|
||||
surface = cairo_vg_surface_create (context, content, width, height);
|
||||
cairo_vg_context_destroy (context);
|
||||
|
||||
if (cairo_surface_status (surface))
|
||||
_cairo_boilerplate_vg_cleanup_egl (vgc);
|
||||
|
||||
return surface;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
_cairo_boilerplate_vg_synchronize (void *closure)
|
||||
{
|
||||
vgFinish ();
|
||||
}
|
||||
|
||||
static const cairo_boilerplate_target_t targets[] = {
|
||||
#if CAIRO_HAS_GLX_FUNCTIONS
|
||||
{
|
||||
"vg-glx", "vg", NULL, NULL,
|
||||
CAIRO_SURFACE_TYPE_VG, CAIRO_CONTENT_COLOR_ALPHA, 1,
|
||||
"cairo_vg_context_create_for_glx",
|
||||
_cairo_boilerplate_vg_create_surface_glx,
|
||||
cairo_surface_create_similar,
|
||||
NULL, NULL,
|
||||
_cairo_boilerplate_get_image_surface,
|
||||
cairo_surface_write_to_png,
|
||||
_cairo_boilerplate_vg_cleanup_glx,
|
||||
_cairo_boilerplate_vg_synchronize,
|
||||
NULL,
|
||||
TRUE, FALSE, FALSE
|
||||
},
|
||||
{
|
||||
"vg-glx", "vg", NULL, NULL,
|
||||
CAIRO_SURFACE_TYPE_VG, CAIRO_CONTENT_COLOR, 1,
|
||||
"cairo_vg_context_create_for_glx",
|
||||
_cairo_boilerplate_vg_create_surface_glx,
|
||||
cairo_surface_create_similar,
|
||||
NULL, NULL,
|
||||
_cairo_boilerplate_get_image_surface,
|
||||
cairo_surface_write_to_png,
|
||||
_cairo_boilerplate_vg_cleanup_glx,
|
||||
_cairo_boilerplate_vg_synchronize,
|
||||
NULL,
|
||||
FALSE, FALSE, FALSE
|
||||
},
|
||||
#endif
|
||||
#if CAIRO_HAS_EGL_FUNCTIONS
|
||||
{
|
||||
"vg-egl", "vg", NULL, NULL,
|
||||
CAIRO_SURFACE_TYPE_VG, CAIRO_CONTENT_COLOR_ALPHA, 1,
|
||||
"cairo_vg_context_create_for_egl",
|
||||
_cairo_boilerplate_vg_create_surface_egl,
|
||||
cairo_surface_create_similar,
|
||||
NULL, NULL,
|
||||
_cairo_boilerplate_get_image_surface,
|
||||
cairo_surface_write_to_png,
|
||||
_cairo_boilerplate_vg_cleanup_egl,
|
||||
_cairo_boilerplate_vg_synchronize,
|
||||
NULL,
|
||||
TRUE, FALSE, FALSE
|
||||
},
|
||||
{
|
||||
"vg-egl", "vg", NULL, NULL,
|
||||
CAIRO_SURFACE_TYPE_VG, CAIRO_CONTENT_COLOR, 1,
|
||||
"cairo_vg_context_create_for_egl",
|
||||
_cairo_boilerplate_vg_create_surface_egl,
|
||||
cairo_surface_create_similar,
|
||||
NULL, NULL,
|
||||
_cairo_boilerplate_get_image_surface,
|
||||
cairo_surface_write_to_png,
|
||||
_cairo_boilerplate_vg_cleanup_egl,
|
||||
_cairo_boilerplate_vg_synchronize,
|
||||
NULL,
|
||||
FALSE, FALSE, FALSE
|
||||
},
|
||||
#endif
|
||||
};
|
||||
CAIRO_BOILERPLATE (vg, targets)
|
||||
|
|
@ -12,7 +12,6 @@ cairo_boilerplate_feature_sources = {
|
|||
'cairo-pdf': ['cairo-boilerplate-pdf.c'],
|
||||
'cairo-ps': ['cairo-boilerplate-ps.c'],
|
||||
'cairo-svg': ['cairo-boilerplate-svg.c'],
|
||||
'cairo-vg': ['cairo-boilerplate-vg.c'],
|
||||
'cairo-script': ['cairo-boilerplate-script.c'],
|
||||
# All tests crash with FPE
|
||||
# 'cairo-egl': ['cairo-boilerplate-egl.c'],
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ CAIRO_HAS_GL_SURFACE=0
|
|||
CAIRO_HAS_GLESV2_SURFACE=0
|
||||
CAIRO_HAS_GLESV3_SURFACE=0
|
||||
CAIRO_HAS_DIRECTFB_SURFACE=0
|
||||
CAIRO_HAS_VG_SURFACE=0
|
||||
CAIRO_HAS_EGL_FUNCTIONS=0
|
||||
CAIRO_HAS_GLX_FUNCTIONS=0
|
||||
CAIRO_HAS_WGL_FUNCTIONS=0
|
||||
|
|
|
|||
|
|
@ -50,9 +50,6 @@ endif
|
|||
ifeq ($(CAIRO_HAS_DIRECTFB_SURFACE),1)
|
||||
@echo "#define CAIRO_HAS_DIRECTFB_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h
|
||||
endif
|
||||
ifeq ($(CAIRO_HAS_VG_SURFACE),1)
|
||||
@echo "#define CAIRO_HAS_VG_SURFACE 1" >> $(top_srcdir)/src/cairo-features.h
|
||||
endif
|
||||
ifeq ($(CAIRO_HAS_EGL_FUNCTIONS),1)
|
||||
@echo "#define CAIRO_HAS_EGL_FUNCTIONS 1" >> $(top_srcdir)/src/cairo-features.h
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -378,7 +378,6 @@ AC_DEFUN([CAIRO_REPORT],
|
|||
echo " OpenGL: $use_gl"
|
||||
echo " OpenGL ES 2.0: $use_glesv2"
|
||||
echo " OpenGL ES 3.0: $use_glesv3"
|
||||
echo " OpenVG: $use_vg"
|
||||
echo ""
|
||||
echo "The following font backends:"
|
||||
echo " User: yes (always builtin)"
|
||||
|
|
|
|||
11
configure.ac
11
configure.ac
|
|
@ -332,17 +332,6 @@ CAIRO_ENABLE_SURFACE_BACKEND(glesv3, OpenGLESv3, no, [
|
|||
|
||||
dnl ===========================================================================
|
||||
|
||||
CAIRO_ENABLE_SURFACE_BACKEND(vg, OpenVG, no, [
|
||||
dnl There is no pkgconfig for OpenVG; lets do a header check
|
||||
AC_CHECK_HEADER(VG/openvg.h,, [use_vg="no (OpenVG headers not found)"])
|
||||
if test "x$use_vg" = "xyes"; then
|
||||
vg_NONPKGCONFIG_CFLAGS=
|
||||
vg_NONPKGCONFIG_LIBS="-lOpenVG"
|
||||
need_egl_functions=yes
|
||||
need_glx_functions=yes
|
||||
fi
|
||||
])
|
||||
|
||||
CAIRO_ENABLE_FUNCTIONS(egl, EGL, auto, [
|
||||
if test "x$need_egl_functions" = "xyes"; then
|
||||
egl_REQUIRES="egl"
|
||||
|
|
|
|||
17
meson.build
17
meson.build
|
|
@ -576,22 +576,6 @@ if feature_conf.get('CAIRO_HAS_GL_SURFACE', 0) == 0 and feature_conf.get('CAIRO_
|
|||
endif
|
||||
endif
|
||||
|
||||
# Untested
|
||||
openvg_dep = cc.find_library('OpenVG', has_headers: 'VG/openvg.h', required: get_option('openvg'))
|
||||
if openvg_dep.found()
|
||||
deps += [openvg_dep]
|
||||
|
||||
need_egl_functions = true
|
||||
need_glx_functions = true
|
||||
|
||||
feature_conf.set('CAIRO_HAS_VG_SURFACE', 1)
|
||||
built_features += [{
|
||||
'name': 'cairo-vg',
|
||||
'description': 'OpenVG surface backend',
|
||||
'deps': [openvg_dep],
|
||||
}]
|
||||
endif
|
||||
|
||||
if need_egl_functions
|
||||
# FIXME: automagic
|
||||
egl_extra_deps = []
|
||||
|
|
@ -950,7 +934,6 @@ summary({
|
|||
'OpenGL': feature_conf.get('CAIRO_HAS_GL_SURFACE', 0) == 1,
|
||||
'OpenGL ES 2.0': feature_conf.get('CAIRO_HAS_GLESV2_SURFACE', 0) == 1,
|
||||
'OpenGL ES 3.0': feature_conf.get('CAIRO_HAS_GLESV3_SURFACE', 0) == 1,
|
||||
'OpenVG': feature_conf.get('CAIRO_HAS_VG_SURFACE', 0) == 1,
|
||||
}, section: 'Surface Backends', bool_yn: true)
|
||||
|
||||
summary({
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ option('gl-backend', type : 'combo', value : 'disabled',
|
|||
choices : ['auto', 'gl', 'glesv2', 'glesv3', 'disabled'])
|
||||
option('glesv2', type : 'feature', value : 'disabled')
|
||||
option('glesv3', type : 'feature', value : 'disabled')
|
||||
option('openvg', type : 'feature', value : 'disabled')
|
||||
option('png', type : 'feature', value : 'auto') # png and svg surfaces
|
||||
option('quartz', type : 'feature', value : 'auto')
|
||||
option('tee', type : 'feature', value : 'disabled')
|
||||
|
|
|
|||
|
|
@ -403,6 +403,3 @@ cairo_tee_sources = cairo-tee-surface.c
|
|||
|
||||
cairo_xml_headers = cairo-xml.h
|
||||
cairo_xml_sources = cairo-xml-surface.c
|
||||
|
||||
cairo_vg_headers = cairo-vg.h
|
||||
cairo_vg_sources = cairo-vg-surface.c
|
||||
|
|
|
|||
|
|
@ -215,20 +215,6 @@ ifeq ($(CAIRO_HAS_GLESV3_SURFACE),1)
|
|||
enabled_cairo_pkgconf += cairo-glesv3.pc
|
||||
endif
|
||||
|
||||
unsupported_cairo_headers += $(cairo_vg_headers)
|
||||
all_cairo_headers += $(cairo_vg_headers)
|
||||
all_cairo_private += $(cairo_vg_private)
|
||||
all_cairo_sources += $(cairo_vg_sources)
|
||||
ifeq ($(CAIRO_HAS_VG_SURFACE),1)
|
||||
enabled_cairo_headers += $(cairo_vg_headers)
|
||||
enabled_cairo_private += $(cairo_vg_private)
|
||||
enabled_cairo_sources += $(cairo_vg_sources)
|
||||
endif
|
||||
all_cairo_pkgconf += cairo-vg.pc
|
||||
ifeq ($(CAIRO_HAS_VG_SURFACE),1)
|
||||
enabled_cairo_pkgconf += cairo-vg.pc
|
||||
endif
|
||||
|
||||
supported_cairo_headers += $(cairo_egl_headers)
|
||||
all_cairo_headers += $(cairo_egl_headers)
|
||||
all_cairo_private += $(cairo_egl_private)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
103
src/cairo-vg.h
103
src/cairo-vg.h
|
|
@ -1,103 +0,0 @@
|
|||
/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */
|
||||
/* cairo - a vector graphics library with display and print output
|
||||
*
|
||||
* Copyright © 2007 * Mozilla Corporation
|
||||
* Copyright © 2009 Chris Wilson
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it either under the terms of the GNU Lesser General Public
|
||||
* License version 2.1 as published by the Free Software Foundation
|
||||
* (the "LGPL") or, at your option, under the terms of the Mozilla
|
||||
* Public License Version 1.1 (the "MPL"). If you do not alter this
|
||||
* notice, a recipient may use your version of this file under either
|
||||
* the MPL or the LGPL.
|
||||
*
|
||||
* You should have received a copy of the LGPL along with this library
|
||||
* in the file COPYING-LGPL-2.1; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
|
||||
* You should have received a copy of the MPL along with this library
|
||||
* in the file COPYING-MPL-1.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License
|
||||
* Version 1.1 (the "License"); you may not use this file except in
|
||||
* compliance with the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY
|
||||
* OF ANY KIND, either express or implied. See the LGPL or the MPL for
|
||||
* the specific language governing rights and limitations.
|
||||
*
|
||||
* The Original Code is the cairo graphics library.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Mozilla Corporation.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Vladimir Vukicevic <vladimir@mozilla.com>
|
||||
* Chris Wilson <chris@chris-wilson.co.uk>
|
||||
*/
|
||||
|
||||
#ifndef CAIRO_VG_H
|
||||
#define CAIRO_VG_H
|
||||
|
||||
#include "cairo.h"
|
||||
|
||||
#if CAIRO_HAS_VG_SURFACE
|
||||
|
||||
#include <VG/openvg.h>
|
||||
|
||||
CAIRO_BEGIN_DECLS
|
||||
|
||||
typedef struct _cairo_vg_context cairo_vg_context_t;
|
||||
|
||||
#if CAIRO_HAS_GLX_FUNCTIONS
|
||||
typedef struct __GLXcontextRec *GLXContext;
|
||||
typedef struct _XDisplay Display;
|
||||
|
||||
cairo_public cairo_vg_context_t *
|
||||
cairo_vg_context_create_for_glx (Display *dpy,
|
||||
GLXContext ctx);
|
||||
#endif
|
||||
|
||||
#if CAIRO_HAS_EGL_FUNCTIONS
|
||||
#include <EGL/egl.h>
|
||||
|
||||
cairo_public cairo_vg_context_t *
|
||||
cairo_vg_context_create_for_egl (EGLDisplay egl_display,
|
||||
EGLContext egl_context);
|
||||
#endif
|
||||
|
||||
cairo_public cairo_status_t
|
||||
cairo_vg_context_status (cairo_vg_context_t *context);
|
||||
|
||||
cairo_public void
|
||||
cairo_vg_context_destroy (cairo_vg_context_t *context);
|
||||
|
||||
cairo_public cairo_surface_t *
|
||||
cairo_vg_surface_create (cairo_vg_context_t *context,
|
||||
cairo_content_t content, int width, int height);
|
||||
|
||||
cairo_public cairo_surface_t *
|
||||
cairo_vg_surface_create_for_image (cairo_vg_context_t *context,
|
||||
VGImage image,
|
||||
VGImageFormat format,
|
||||
int width, int height);
|
||||
|
||||
cairo_public VGImage
|
||||
cairo_vg_surface_get_image (cairo_surface_t *abstract_surface);
|
||||
|
||||
cairo_public VGImageFormat
|
||||
cairo_vg_surface_get_format (cairo_surface_t *abstract_surface);
|
||||
|
||||
cairo_public int
|
||||
cairo_vg_surface_get_height (cairo_surface_t *abstract_surface);
|
||||
|
||||
cairo_public int
|
||||
cairo_vg_surface_get_width (cairo_surface_t *abstract_surface);
|
||||
|
||||
CAIRO_END_DECLS
|
||||
|
||||
#else /* CAIRO_HAS_VG_SURFACE*/
|
||||
# error Cairo was not compiled with support for the OpenVG backend
|
||||
#endif /* CAIRO_HAS_VG_SURFACE*/
|
||||
|
||||
#endif /* CAIRO_VG_H */
|
||||
|
|
@ -5320,85 +5320,6 @@ cairo_recording_surface_create (cairo_content_t content,
|
|||
return ret;
|
||||
}
|
||||
|
||||
#if CAIRO_HAS_VG_SURFACE
|
||||
#include <cairo-vg.h>
|
||||
cairo_surface_t *
|
||||
cairo_vg_surface_create (cairo_vg_context_t *context,
|
||||
cairo_content_t content,
|
||||
int width, int height)
|
||||
{
|
||||
cairo_surface_t *ret;
|
||||
|
||||
_enter_trace ();
|
||||
|
||||
ret = DLCALL (cairo_vg_surface_create, context, content, width, height);
|
||||
|
||||
_emit_line_info ();
|
||||
if (_write_lock ()) {
|
||||
Object *obj = _create_surface (ret);
|
||||
|
||||
_trace_printf ("dict\n"
|
||||
" /type /vg set\n"
|
||||
" /content //%s set\n"
|
||||
" /width %d set\n"
|
||||
" /height %d set\n"
|
||||
" surface dup /s%ld exch def\n",
|
||||
_content_to_string (content),
|
||||
width, height,
|
||||
obj->token);
|
||||
obj->width = width;
|
||||
obj->height = height;
|
||||
obj->defined = TRUE;
|
||||
_push_object (obj);
|
||||
dump_stack(__func__);
|
||||
_write_unlock ();
|
||||
}
|
||||
|
||||
_exit_trace ();
|
||||
return ret;
|
||||
}
|
||||
|
||||
cairo_surface_t *
|
||||
cairo_vg_surface_create_for_image (cairo_vg_context_t *context,
|
||||
VGImage image,
|
||||
VGImageFormat format,
|
||||
int width, int height)
|
||||
{
|
||||
cairo_surface_t *ret;
|
||||
|
||||
_enter_trace ();
|
||||
|
||||
ret = DLCALL (cairo_vg_surface_create_for_image,
|
||||
context, image, format, width, height);
|
||||
|
||||
_emit_line_info ();
|
||||
if (_write_lock ()) {
|
||||
Object *obj = _create_surface (ret);
|
||||
cairo_content_t content;
|
||||
|
||||
content = DLCALL (cairo_surface_get_content, ret);
|
||||
_trace_printf ("dict\n"
|
||||
" /type /vg set\n"
|
||||
" /content //%s set\n"
|
||||
" /width %d set\n"
|
||||
" /height %d set\n"
|
||||
" surface dup /s%ld exch def\n",
|
||||
_content_to_string (content),
|
||||
width, height,
|
||||
obj->token);
|
||||
obj->width = width;
|
||||
obj->height = height;
|
||||
obj->defined = TRUE;
|
||||
_push_object (obj);
|
||||
dump_stack(__func__);
|
||||
_write_unlock ();
|
||||
}
|
||||
|
||||
_exit_trace ();
|
||||
return ret;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if CAIRO_HAS_GL_SURFACE || CAIRO_HAS_GLESV2_SURFACE
|
||||
#include <cairo-gl.h>
|
||||
cairo_surface_t *
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue