[cairo-commit] glitz/src glitz.c, 1.12, 1.13 glitz_glx_info.c, 1.7, 1.8

[David Reveman]

Committed by: davidr

Update of /cvs/cairo/glitz/src
In directory pdx:/tmp/cvs-serv11808/src

Modified Files:
	glitz.c glitz_glx_info.c 
Log Message:
Fixed typo in _glitz_composite_direct

Index: glitz.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** a/glitz.c	27 May 2004 06:24:46 -0000	1.12
--- b/glitz.c	28 May 2004 20:49:04 -0000	1.13
***************
*** 150,154 ****
      src_box.x1 += x_dst - x_src;
      src_box.x2 += x_dst - x_src;
!     src_box.y2 += y_dst - y_src;
      src_box.y2 += y_dst - y_src;
  
--- 150,154 ----
      src_box.x1 += x_dst - x_src;
      src_box.x2 += x_dst - x_src;
!     src_box.y1 += y_dst - y_src;
      src_box.y2 += y_dst - y_src;
  
***************
*** 169,173 ****
      mask_box.x1 += x_dst - x_mask;
      mask_box.x2 += x_dst - x_mask;
!     mask_box.y2 += y_dst - y_mask;
      mask_box.y2 += y_dst - y_mask;
  
--- 169,173 ----
      mask_box.x1 += x_dst - x_mask;
      mask_box.x2 += x_dst - x_mask;
!     mask_box.y1 += y_dst - y_mask;
      mask_box.y2 += y_dst - y_mask;
  

Index: glitz_glx_info.c
===================================================================
RCS file: /cvs/cairo/glitz/src/glitz_glx_info.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** a/glitz_glx_info.c	28 May 2004 01:04:29 -0000	1.7
--- b/glitz_glx_info.c	28 May 2004 20:49:04 -0000	1.8
***************
*** 126,131 ****
  glitz_glx_proc_address_lookup (glitz_glx_thread_info_t *info)
  {
-   info->glx.get_proc_address_arb = (glitz_glx_get_proc_address_arb_t)
-     glitz_glx_get_proc_address (info, "glXGetProcAddressARB");
    info->glx.get_fbconfigs = (glitz_glx_get_fbconfigs_t)
      glitz_glx_get_proc_address (info, "glXGetFBConfigs");
--- 126,129 ----
***************
*** 140,143 ****
--- 138,143 ----
    info->glx.make_context_current = (glitz_glx_make_context_current_t)
      glitz_glx_get_proc_address (info, "glXMakeContextCurrent");
+   info->glx.get_proc_address_arb = (glitz_glx_get_proc_address_arb_t)
+     glitz_glx_get_proc_address (info, "glXGetProcAddressARB");
    
    info->glx.need_lookup = 0;