diff options
author | Benjamin Otte <otte@redhat.com> | 2010-01-27 09:56:14 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2010-01-27 09:56:14 +0100 |
commit | 58980b4ad60a60923a59370c81d59bb0457a7922 (patch) | |
tree | 568fdd7f5a8449f0df75200907fec668844b1cd8 /boilerplate | |
parent | 17ddb1598b3df374b6275d907441f34318b4257f (diff) |
build: Remove glitz surface
glitz is unmaintained and the GL surface is far superior anyway.
Diffstat (limited to 'boilerplate')
-rw-r--r-- | boilerplate/Makefile.am | 13 | ||||
-rw-r--r-- | boilerplate/Makefile.sources | 5 | ||||
-rw-r--r-- | boilerplate/Makefile.win32.features | 10 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-glitz-agl.c | 191 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-glitz-glx.c | 265 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-glitz-wgl.c | 188 |
6 files changed, 0 insertions, 672 deletions
diff --git a/boilerplate/Makefile.am b/boilerplate/Makefile.am index 10fb6af3..547f4156 100644 --- a/boilerplate/Makefile.am +++ b/boilerplate/Makefile.am @@ -32,19 +32,6 @@ if CAIRO_HAS_BEOS_SURFACE AM_CPPFLAGS += -Wno-multichar endif -if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE -libcairoboilerplate_la_LIBADD += $(GLITZ_AGL_LIBS) -endif -if CAIRO_CAN_TEST_GLITZ_EGL_SURFACE -libcairoboilerplate_la_LIBADD += $(GLITZ_EGL_LIBS) -endif -if CAIRO_CAN_TEST_GLITZ_GLX_SURFACE -libcairoboilerplate_la_LIBADD += $(GLITZ_GLX_LIBS) -endif -if CAIRO_CAN_TEST_GLITZ_WGL_SURFACE -libcairoboilerplate_la_LIBADD += $(GLITZ_WGL_LIBS) -endif - if CAIRO_HAS_WIN32_SURFACE libcairoboilerplate_la_LIBADD += -lwinspool endif diff --git a/boilerplate/Makefile.sources b/boilerplate/Makefile.sources index d40d7f9f..b590b7f1 100644 --- a/boilerplate/Makefile.sources +++ b/boilerplate/Makefile.sources @@ -26,11 +26,6 @@ cairo_boilerplate_private = \ cairo_boilerplate_directfb_sources = cairo-boilerplate-directfb.c cairo_boilerplate_drm_sources = cairo-boilerplate-drm.c cairo_boilerplate_gl_sources = cairo-boilerplate-gl.c -cairo_boilerplate_glitz_sources = \ - cairo-boilerplate-glitz-agl.c \ - cairo-boilerplate-glitz-glx.c \ - cairo-boilerplate-glitz-wgl.c \ - $(NULL) cairo_boilerplate_pdf_sources = cairo-boilerplate-pdf.c cairo_boilerplate_ps_sources = cairo-boilerplate-ps.c cairo_boilerplate_qt_sources = cairo-boilerplate-qt.cpp diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 07427872..bcf41a8c 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -209,16 +209,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_gl_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_gl_sources) endif -unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers) -all_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers) -all_cairo_boilerplate_private += $(cairo_boilerplate_glitz_private) -all_cairo_boilerplate_sources += $(cairo_boilerplate_glitz_sources) -ifeq ($(CAIRO_HAS_GLITZ_SURFACE),1) -enabled_cairo_boilerplate_headers += $(cairo_boilerplate_glitz_headers) -enabled_cairo_boilerplate_private += $(cairo_boilerplate_glitz_private) -enabled_cairo_boilerplate_sources += $(cairo_boilerplate_glitz_sources) -endif - unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_directfb_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_directfb_private) diff --git a/boilerplate/cairo-boilerplate-glitz-agl.c b/boilerplate/cairo-boilerplate-glitz-agl.c deleted file mode 100644 index 679593bc..00000000 --- a/boilerplate/cairo-boilerplate-glitz-agl.c +++ /dev/null @@ -1,191 +0,0 @@ -/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ -/* - * Copyright © 2004,2006 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of - * Red Hat, Inc. not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. Red Hat, Inc. makes no representations about the - * suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Carl D. Worth <cworth@cworth.org> - */ - -#include "cairo-boilerplate-private.h" - -#if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE -#include <cairo-glitz.h> -#include <glitz-agl.h> - -static const cairo_user_data_key_t glitz_closure_key; - -typedef struct _glitz_agl_target_closure { - glitz_target_closure_base_t base; -} glitz_agl_target_closure_t; - -static glitz_surface_t * -_cairo_boilerplate_glitz_agl_create_surface_internal (glitz_format_name_t formatname, - int width, - int height, - glitz_agl_target_closure_t *closure) -{ - glitz_drawable_format_t *dformat; - glitz_drawable_format_t templ; - glitz_drawable_t *gdraw; - glitz_format_t *format; - glitz_surface_t *sr = NULL; - unsigned long mask; - - memset(&templ, 0, sizeof(templ)); - templ.color.red_size = 8; - templ.color.green_size = 8; - templ.color.blue_size = 8; - templ.color.alpha_size = 8; - templ.color.fourcc = GLITZ_FOURCC_RGB; - templ.samples = 1; - - mask = GLITZ_FORMAT_SAMPLES_MASK | GLITZ_FORMAT_FOURCC_MASK | - GLITZ_FORMAT_RED_SIZE_MASK | GLITZ_FORMAT_GREEN_SIZE_MASK | - GLITZ_FORMAT_BLUE_SIZE_MASK; - if (formatname == GLITZ_STANDARD_ARGB32) - mask |= GLITZ_FORMAT_ALPHA_SIZE_MASK; - - dformat = glitz_agl_find_pbuffer_format (mask, &templ, 0); - if (!dformat) { - fprintf (stderr, "Glitz failed to find pbuffer format for template."); - goto FAIL; - } - - gdraw = glitz_agl_create_pbuffer_drawable (dformat, width, height); - if (!gdraw) { - fprintf (stderr, "Glitz failed to create pbuffer drawable."); - goto FAIL; - } - - format = glitz_find_standard_format (gdraw, formatname); - if (!format) { - fprintf (stderr, "Glitz failed to find standard format for drawable."); - goto DESTROY_DRAWABLE; - } - - sr = glitz_surface_create (gdraw, format, width, height, 0, NULL); - if (!sr) { - fprintf (stderr, "Glitz failed to create a surface."); - goto DESTROY_DRAWABLE; - } - - glitz_surface_attach (sr, gdraw, GLITZ_DRAWABLE_BUFFER_FRONT_COLOR); - - DESTROY_DRAWABLE: - glitz_drawable_destroy (gdraw); - return sr; - - FAIL: - return NULL; -} - -static cairo_surface_t * -_cairo_boilerplate_glitz_agl_create_surface (const char *name, - cairo_content_t content, - double width, - double height, - double max_width, - double max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure) -{ - glitz_surface_t *glitz_surface; - cairo_surface_t *surface = NULL; - glitz_agl_target_closure_t *aglc; - int status; - - glitz_agl_init (); - - *closure = aglc = xmalloc (sizeof (glitz_agl_target_closure_t)); - - switch (content) { - case CAIRO_CONTENT_COLOR: - glitz_surface = _cairo_boilerplate_glitz_agl_create_surface_internal (GLITZ_STANDARD_RGB24, width, height, NULL); - break; - case CAIRO_CONTENT_COLOR_ALPHA: - glitz_surface = _cairo_boilerplate_glitz_agl_create_surface_internal (GLITZ_STANDARD_ARGB32, width, height, NULL); - break; - case CAIRO_CONTENT_ALPHA: - default: - fprintf (stderr, "Invalid content for glitz-agl test: %d\n", content); - goto FAIL; - } - - if (!glitz_surface) - goto FAIL; - - surface = cairo_glitz_surface_create (glitz_surface); - glitz_surface_destroy (glitz_surface); - - if (cairo_surface_status (surface)) - goto FAIL; - - aglc->base.width = width; - aglc->base.height = height; - aglc->base.content = content; - status = cairo_surface_set_user_data (surface, - &glitz_closure_key, aglc, NULL); - if (status == CAIRO_STATUS_SUCCESS) - return surface; - - cairo_surface_destroy (surface); - surface = cairo_boilerplate_surface_create_in_error (status); - - FAIL: - glitz_agl_fini (); - return surface; -} - -static void -_cairo_boilerplate_glitz_agl_cleanup (void *closure) -{ - free (closure); - glitz_agl_fini (); -} - -#endif - -static const cairo_boilerplate_target_t targets[] = { -#if CAIRO_CAN_TEST_GLITZ_AGL_SURFACE - { - "glitz-agl", "glitz", NULL, NULL, - CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR_ALPHA, 0, - "cairo_glitz_surface_create", - _cairo_boilerplate_glitz_agl_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_glitz_agl_cleanup - }, - { - "glitz-agl", "glitz", NULL, NULL, - CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR, 0, - "cairo_glitz_surface_create", - _cairo_boilerplate_glitz_agl_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_glitz_agl_cleanup - }, -#endif -}; -CAIRO_BOILERPLATE (glitz_agl, targets) diff --git a/boilerplate/cairo-boilerplate-glitz-glx.c b/boilerplate/cairo-boilerplate-glitz-glx.c deleted file mode 100644 index d490aecb..00000000 --- a/boilerplate/cairo-boilerplate-glitz-glx.c +++ /dev/null @@ -1,265 +0,0 @@ -/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ -/* - * Copyright © 2004,2006 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of - * Red Hat, Inc. not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. Red Hat, Inc. makes no representations about the - * suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Carl D. Worth <cworth@cworth.org> - */ - -#include "cairo-boilerplate-private.h" - -#if CAIRO_CAN_TEST_GLITZ_GLX_SURFACE -#include <cairo-glitz.h> -#include <glitz-glx.h> - -static const cairo_user_data_key_t glitz_closure_key; - -typedef struct _glitz_glx_target_closure { - Display *dpy; - int scr; - Window win; -} glitz_glx_target_closure_t; - -static glitz_surface_t * -_cairo_boilerplate_glitz_glx_create_surface_internal (glitz_format_name_t formatname, - int width, - int height, - glitz_glx_target_closure_t *closure) -{ - Display * dpy = closure->dpy; - int scr = closure->scr; - glitz_drawable_format_t templ; - glitz_drawable_format_t * dformat = NULL; - unsigned long mask; - glitz_drawable_t * drawable = NULL; - glitz_format_t * format; - glitz_surface_t * sr; - - XSizeHints xsh; - XSetWindowAttributes xswa; - XVisualInfo * vinfo; - - memset(&templ, 0, sizeof(templ)); - templ.color.red_size = 8; - templ.color.green_size = 8; - templ.color.blue_size = 8; - templ.color.alpha_size = 8; - templ.color.fourcc = GLITZ_FOURCC_RGB; - templ.samples = 1; - - glitz_glx_init (NULL); - - mask = GLITZ_FORMAT_SAMPLES_MASK | GLITZ_FORMAT_FOURCC_MASK | - GLITZ_FORMAT_RED_SIZE_MASK | GLITZ_FORMAT_GREEN_SIZE_MASK | - GLITZ_FORMAT_BLUE_SIZE_MASK; - if (formatname == GLITZ_STANDARD_ARGB32) - mask |= GLITZ_FORMAT_ALPHA_SIZE_MASK; - - /* Try for a pbuffer first */ - if (!getenv("CAIRO_TEST_FORCE_GLITZ_WINDOW")) - dformat = glitz_glx_find_pbuffer_format (dpy, scr, mask, &templ, 0); - - if (dformat) { - closure->win = None; - - drawable = glitz_glx_create_pbuffer_drawable (dpy, scr, dformat, - width, height); - if (!drawable) - goto FAIL; - } else { - /* No pbuffer, try window */ - dformat = glitz_glx_find_window_format (dpy, scr, mask, &templ, 0); - - if (!dformat) - goto FAIL; - - vinfo = glitz_glx_get_visual_info_from_format(dpy, - DefaultScreen(dpy), - dformat); - - if (!vinfo) - goto FAIL; - - xsh.flags = PSize; - xsh.x = 0; - xsh.y = 0; - xsh.width = width; - xsh.height = height; - - xswa.colormap = XCreateColormap (dpy, RootWindow(dpy, scr), - vinfo->visual, AllocNone); - closure->win = XCreateWindow (dpy, RootWindow(dpy, scr), - xsh.x, xsh.y, xsh.width, xsh.height, - 0, vinfo->depth, CopyFromParent, - vinfo->visual, CWColormap, &xswa); - XFree (vinfo); - - drawable = - glitz_glx_create_drawable_for_window (dpy, scr, - dformat, closure->win, - width, height); - - if (!drawable) - goto DESTROY_WINDOW; - } - - format = glitz_find_standard_format (drawable, formatname); - if (!format) - goto DESTROY_DRAWABLE; - - sr = glitz_surface_create (drawable, format, width, height, 0, NULL); - if (!sr) - goto DESTROY_DRAWABLE; - - if (closure->win == None || dformat->doublebuffer) { - glitz_surface_attach (sr, drawable, GLITZ_DRAWABLE_BUFFER_BACK_COLOR); - } else { - XMapWindow (closure->dpy, closure->win); - glitz_surface_attach (sr, drawable, GLITZ_DRAWABLE_BUFFER_FRONT_COLOR); - } - - glitz_drawable_destroy (drawable); - - return sr; - - DESTROY_DRAWABLE: - glitz_drawable_destroy (drawable); - DESTROY_WINDOW: - if (closure->win) - XDestroyWindow (dpy, closure->win); - FAIL: - return NULL; -} - -static cairo_surface_t * -_cairo_boilerplate_glitz_glx_create_surface (const char *name, - cairo_content_t content, - double width, - double height, - double max_width, - double max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure) -{ - glitz_glx_target_closure_t *gxtc; - glitz_surface_t * glitz_surface; - cairo_surface_t * surface = NULL; - cairo_status_t status; - - *closure = gxtc = xmalloc (sizeof (glitz_glx_target_closure_t)); - - if (width == 0) - width = 1; - if (height == 0) - height = 1; - - gxtc->dpy = XOpenDisplay (getenv("CAIRO_TEST_GLITZ_DISPLAY")); - if (!gxtc->dpy) { - fprintf (stderr, "Failed to open display: %s\n", XDisplayName(0)); - goto FAIL; - } - - XSynchronize (gxtc->dpy, 1); - - gxtc->scr = DefaultScreen(gxtc->dpy); - - switch (content) { - case CAIRO_CONTENT_COLOR: - glitz_surface = _cairo_boilerplate_glitz_glx_create_surface_internal (GLITZ_STANDARD_RGB24, width, height, gxtc); - break; - case CAIRO_CONTENT_COLOR_ALPHA: - glitz_surface = _cairo_boilerplate_glitz_glx_create_surface_internal (GLITZ_STANDARD_ARGB32, width, height, gxtc); - break; - case CAIRO_CONTENT_ALPHA: - default: - fprintf (stderr, "Invalid content for glitz-glx test: %d\n", content); - goto FAIL_CLOSE_DISPLAY; - } - if (!glitz_surface) { - fprintf (stderr, "Failed to create glitz-glx surface\n"); - goto FAIL_CLOSE_DISPLAY; - } - - surface = cairo_glitz_surface_create (glitz_surface); - glitz_surface_destroy (glitz_surface); - - if (cairo_surface_status (surface)) - goto FAIL_CLOSE_DISPLAY; - - status = cairo_surface_set_user_data (surface, - &glitz_closure_key, gxtc, NULL); - if (status == CAIRO_STATUS_SUCCESS) - return surface; - - cairo_surface_destroy (surface); - surface = cairo_boilerplate_surface_create_in_error (status); - - FAIL_CLOSE_DISPLAY: - glitz_glx_fini (); - XCloseDisplay (gxtc->dpy); - FAIL: - free (gxtc); - return surface; -} - -static void -_cairo_boilerplate_glitz_glx_cleanup (void *closure) -{ - glitz_glx_target_closure_t *gxtc = closure; - - glitz_glx_fini (); - - if (gxtc->win) - XDestroyWindow (gxtc->dpy, gxtc->win); - - XCloseDisplay (gxtc->dpy); - - free (gxtc); -} - -#endif - -static const cairo_boilerplate_target_t targets[] = { -#if CAIRO_CAN_TEST_GLITZ_GLX_SURFACE - { - "glitz-glx", "glitz", NULL, NULL, - CAIRO_SURFACE_TYPE_GLITZ,CAIRO_CONTENT_COLOR_ALPHA, 0, - "cairo_glitz_surface_create", - _cairo_boilerplate_glitz_glx_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_glitz_glx_cleanup - }, - { - "glitz-glx", "glitz", NULL, NULL, - CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR, 0, - "cairo_glitz_surface_create", - _cairo_boilerplate_glitz_glx_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_glitz_glx_cleanup - }, -#endif -}; -CAIRO_BOILERPLATE (glitz_glx, targets) diff --git a/boilerplate/cairo-boilerplate-glitz-wgl.c b/boilerplate/cairo-boilerplate-glitz-wgl.c deleted file mode 100644 index f50d68b7..00000000 --- a/boilerplate/cairo-boilerplate-glitz-wgl.c +++ /dev/null @@ -1,188 +0,0 @@ -/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */ -/* - * Copyright © 2004,2006 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of - * Red Hat, Inc. not be used in advertising or publicity pertaining to - * distribution of the software without specific, written prior - * permission. Red Hat, Inc. makes no representations about the - * suitability of this software for any purpose. It is provided "as - * is" without express or implied warranty. - * - * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER - * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR - * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Carl D. Worth <cworth@cworth.org> - */ - -#include "cairo-boilerplate-private.h" - -#if CAIRO_CAN_TEST_GLITZ_WGL_SURFACE -#include <cairo-glitz.h> -#include <glitz-wgl.h> - -static const cairo_user_data_key_t glitz_closure_key; - -typedef struct _glitz_wgl_target_closure { - glitz_target_closure_base_t base; -} glitz_wgl_target_closure_t; - -static glitz_surface_t * -_cairo_boilerplate_glitz_wgl_create_surface_internal (glitz_format_name_t formatname, - int width, - int height, - glitz_wgl_target_closure_t *closure) -{ - glitz_drawable_format_t *dformat; - glitz_drawable_format_t templ; - glitz_drawable_t *gdraw; - glitz_format_t *format; - glitz_surface_t *sr = NULL; - unsigned long mask; - - memset(&templ, 0, sizeof(templ)); - templ.color.red_size = 8; - templ.color.green_size = 8; - templ.color.blue_size = 8; - templ.color.alpha_size = 8; - templ.color.fourcc = GLITZ_FOURCC_RGB; - templ.samples = 1; - - mask = GLITZ_FORMAT_SAMPLES_MASK | GLITZ_FORMAT_FOURCC_MASK | - GLITZ_FORMAT_RED_SIZE_MASK | GLITZ_FORMAT_GREEN_SIZE_MASK | - GLITZ_FORMAT_BLUE_SIZE_MASK; - if (formatname == GLITZ_STANDARD_ARGB32) - mask |= GLITZ_FORMAT_ALPHA_SIZE_MASK; - - dformat = glitz_wgl_find_pbuffer_format (mask, &templ, 0); - if (!dformat) { - fprintf (stderr, "Glitz failed to find pbuffer format for template."); - goto FAIL; - } - - gdraw = glitz_wgl_create_pbuffer_drawable (dformat, width, height); - if (!gdraw) { - fprintf (stderr, "Glitz failed to create pbuffer drawable."); - goto FAIL; - } - - format = glitz_find_standard_format (gdraw, formatname); - if (!format) { - fprintf (stderr, "Glitz failed to find standard format for drawable."); - goto DESTROY_DRAWABLE; - } - - sr = glitz_surface_create (gdraw, format, width, height, 0, NULL); - if (!sr) { - fprintf (stderr, "Glitz failed to create a surface."); - goto DESTROY_DRAWABLE; - } - - glitz_surface_attach (sr, gdraw, GLITZ_DRAWABLE_BUFFER_FRONT_COLOR); - - DESTROY_DRAWABLE: - glitz_drawable_destroy (gdraw); - - FAIL: - return sr; /* will be NULL unless we create it and attach */ -} - -static cairo_surface_t * -_cairo_boilerplate_glitz_wgl_create_surface (const char *name, - cairo_content_t content, - double width, - double height, - double max_width, - double max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure) -{ - glitz_surface_t *glitz_surface; - cairo_surface_t *surface = NULL; - glitz_wgl_target_closure_t *wglc; - - glitz_wgl_init (NULL); - - *closure = wglc = xmalloc (sizeof (glitz_wgl_target_closure_t)); - - switch (content) { - case CAIRO_CONTENT_COLOR: - glitz_surface = _cairo_boilerplate_glitz_wgl_create_surface_internal (GLITZ_STANDARD_RGB24, width, height, NULL); - break; - case CAIRO_CONTENT_COLOR_ALPHA: - glitz_surface = _cairo_boilerplate_glitz_wgl_create_surface_internal (GLITZ_STANDARD_ARGB32, width, height, NULL); - break; - default: - fprintf (stderr, "Invalid content for glitz-wgl test: %d\n", content); - goto FAIL; - } - - if (!glitz_surface) - goto FAIL; - - surface = cairo_glitz_surface_create (glitz_surface); - glitz_surface_destroy (glitz_surface); - - if (cairo_surface_status (surface)) - goto FAIL; - - wglc->base.width = width; - wglc->base.height = height; - wglc->base.content = content; - status = cairo_surface_set_user_data (surface, - &glitz_closure_key, wglc, NULL); - if (status == CAIRO_STATUS_SUCCESS) - return surface; - - cairo_surface_destroy (surface); - surface = cairo_boilerplate_surface_create_in_error (status); - - FAIL: - glitz_wgl_fini (); - free (wglc); - return surface; -} - -static void -_cairo_boilerplate_glitz_wgl_cleanup (void *closure) -{ - free (closure); - glitz_wgl_fini (); -} -#endif - -static const cairo_boilerplate_target_t targets[] = { -#if CAIRO_CAN_TEST_GLITZ_WGL_SURFACE - { - "glitz-wgl", "glitz", NULL, NULL, - CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR_ALPHA, 0, - "cairo_glitz_surface_create", - _cairo_boilerplate_glitz_wgl_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_glitz_wgl_cleanup - }, - { - "glitz-wgl", "glitz", NULL, NULL, - CAIRO_SURFACE_TYPE_GLITZ, CAIRO_CONTENT_COLOR, 0, - "cairo_glitz_surface_create", - _cairo_boilerplate_glitz_wgl_create_surface, - NULL, NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_glitz_wgl_cleanup - }, -#endif -}; -CAIRO_BOILERPLATE (glitz_wgl, targets) |