[cairo-commit] rendertest/src Makefile.am, 1.3, 1.4 pixman.c, NONE, 1.1 xcb.c, 1.3, 1.4

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/rendertest/src
In directory gabe:/tmp/cvs-serv25432/src

Modified Files:
	Makefile.am xcb.c 
Added Files:
	pixman.c 
Log Message:
Added pixman backend

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/rendertest/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	3 Sep 2004 14:29:26 -0000	1.3
--- Makefile.am	12 Sep 2004 03:05:47 -0000	1.4
***************
*** 46,51 ****
  endif
  
  bin_PROGRAMS = \
  	$(glitz_glx_program) \
  	$(glitz_agl_program) \
! 	$(xcb_program)
--- 46,63 ----
  endif
  
+ if RENDER_PIXMAN_BACKEND
+ pixman_program = rendertest_pixman
+ 
+ rendertest_pixman_SOURCES = \
+ 	$(rendertest_common_sources) \
+ 	pixman.c
+ 
+ rendertest_pixman_CFLAGS = $(PIXMAN_CFLAGS) $(LIBPNG_CFLAGS)
+ rendertest_pixman_LDADD = $(PIXMAN_LIBS) $(LIBPNG_LIBS) -lm
+ endif
+ 
  bin_PROGRAMS = \
  	$(glitz_glx_program) \
  	$(glitz_agl_program) \
! 	$(xcb_program) \
! 	$(pixman_program)

--- NEW FILE: pixman.c ---
(This appears to be a binary file; contents omitted.)

Index: xcb.c
===================================================================
RCS file: /cvs/cairo/rendertest/src/xcb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xcb.c	3 Sep 2004 14:29:26 -0000	1.3
--- xcb.c	12 Sep 2004 03:05:47 -0000	1.4
***************
*** 314,318 ****
  
    XCBFreePixmap (s->c, s->drawable.pixmap);
!   
    free (surface);
  }
--- 314,319 ----
  
    XCBFreePixmap (s->c, s->drawable.pixmap);
! 
!   free (s);
    free (surface);
  }
***************
*** 456,460 ****
  static render_status_t
  _xcb_render_set_transform (render_surface_t *surface,
!                             render_matrix_t *matrix)
  {
    XCBRenderTRANSFORM transform;
--- 457,461 ----
  static render_status_t
  _xcb_render_set_transform (render_surface_t *surface,
!                            render_matrix_t *matrix)
  {
    XCBRenderTRANSFORM transform;
***************
*** 548,552 ****
  }
  
! static const render_backend_t _glitz_xcb_render_backend = {
    _xcb_render_create_similar,
    _xcb_render_destroy,
--- 549,553 ----
  }
  
! static const render_backend_t _xcb_render_backend = {
    _xcb_render_create_similar,
    _xcb_render_destroy,
***************
*** 595,599 ****
      return 1;
    
!   surface.backend = &_glitz_xcb_render_backend;
    surface.flags = 0;
  
--- 596,600 ----
      return 1;
    
!   surface.backend = &_xcb_render_backend;
    surface.flags = 0;