[cairo-commit] libglxc/src glxc.c,1.2,1.3 glxc_rect.c,1.2,1.3 glxc_trap.c,1.2,1.3 glxc_tri.c,1.2,1.3

[David Reveman]

Committed by: c99drn

Update of /cvs/cairo/libglxc/src
In directory pdx:/tmp/cvs-serv26661/src

Modified Files:
	glxc.c glxc_rect.c glxc_trap.c glxc_tri.c 
Log Message:
intermediate to texture Y offset fix

Index: glxc.c
===================================================================
RCS file: /cvs/cairo/libglxc/src/glxc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glxc.c	24 Nov 2003 11:06:13 -0000	1.2
--- glxc.c	25 Nov 2003 01:13:03 -0000	1.3
***************
*** 366,370 ****
      glCopyTexSubImage2D (texture_target, 0,
                           ibounds.x1,
!                          dst->real_width - (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);
--- 366,371 ----
      glCopyTexSubImage2D (texture_target, 0,
                           ibounds.x1,
!                          dst->real_height -
!                          (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);

Index: glxc_rect.c
===================================================================
RCS file: /cvs/cairo/libglxc/src/glxc_rect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glxc_rect.c	24 Nov 2003 11:06:13 -0000	1.2
--- glxc_rect.c	25 Nov 2003 01:13:03 -0000	1.3
***************
*** 88,91 ****
--- 88,94 ----
      glxc_intermediate_bounds (dst, &bounds, &ibounds,
                                &x_draw_offset, &y_draw_offset);
+ 
+     if ((ibounds.x2 - ibounds.x1) <= 0 || (ibounds.y2 - ibounds.y1) <= 0)
+       return;
      
      intermediate = surface =
***************
*** 152,156 ****
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_width - (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);
--- 155,160 ----
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_height -
!                          (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);
***************
*** 187,190 ****
--- 191,197 ----
      glxc_intermediate_bounds (dst, &bounds, &ibounds,
                                &x_draw_offset, &y_draw_offset);
+ 
+     if ((ibounds.x2 - ibounds.x1) <= 0 || (ibounds.y2 - ibounds.y1) <= 0)
+       return;
      
      intermediate = surface =
***************
*** 242,246 ****
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_width - (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);
--- 249,254 ----
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_height -
!                          (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);

Index: glxc_trap.c
===================================================================
RCS file: /cvs/cairo/libglxc/src/glxc_trap.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glxc_trap.c	24 Nov 2003 11:06:13 -0000	1.2
--- glxc_trap.c	25 Nov 2003 01:13:03 -0000	1.3
***************
*** 139,142 ****
--- 139,146 ----
                              &x_draw_offset, &y_draw_offset);
  
+   if ((mask_bounds.x2 - mask_bounds.x1) <= 0 ||
+       (mask_bounds.y2 - mask_bounds.y1) <= 0)
+     return;
+ 
    mask =
      glxc_surface_create_intermediate_at_size (dst->display,
***************
*** 267,270 ****
--- 271,277 ----
      glxc_intermediate_bounds (dst, &bounds, &ibounds,
                                &x_draw_offset, &y_draw_offset);
+ 
+     if ((ibounds.x2 - ibounds.x1) <= 0 || (ibounds.y2 - ibounds.y1) <= 0)
+       return;
      
      intermediate = surface =
***************
*** 365,369 ****
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_width - (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);
--- 372,377 ----
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_height -
!                          (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);

Index: glxc_tri.c
===================================================================
RCS file: /cvs/cairo/libglxc/src/glxc_tri.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** glxc_tri.c	24 Nov 2003 11:06:13 -0000	1.2
--- glxc_tri.c	25 Nov 2003 01:13:03 -0000	1.3
***************
*** 104,107 ****
--- 104,111 ----
    glxc_intermediate_bounds (dst, &bounds, &mask_bounds,
                              &x_draw_offset, &y_draw_offset);
+ 
+   if ((mask_bounds.x2 - mask_bounds.x1) <= 0 ||
+       (mask_bounds.y2 - mask_bounds.y1) <= 0)
+     return;
      
    mask =
***************
*** 206,209 ****
--- 210,217 ----
    glxc_intermediate_bounds (dst, &bounds, &mask_bounds,
                              &x_draw_offset, &y_draw_offset);
+ 
+   if ((mask_bounds.x2 - mask_bounds.x1) <= 0 ||
+       (mask_bounds.y2 - mask_bounds.y1) <= 0)
+     return;
      
    mask =
***************
*** 303,306 ****
--- 311,318 ----
    glxc_intermediate_bounds (dst, &bounds, &mask_bounds,
                              &x_draw_offset, &y_draw_offset);
+ 
+   if ((mask_bounds.x2 - mask_bounds.x1) <= 0 ||
+       (mask_bounds.y2 - mask_bounds.y1) <= 0)
+     return;
      
    mask =
***************
*** 432,435 ****
--- 444,450 ----
      glxc_intermediate_bounds (dst, &bounds, &ibounds,
                                &x_draw_offset, &y_draw_offset);
+ 
+     if ((ibounds.x2 - ibounds.x1) <= 0 || (ibounds.y2 - ibounds.y1) <= 0)
+       return;
      
      intermediate = surface =
***************
*** 517,521 ****
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_width - (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);
--- 532,537 ----
      glCopyTexSubImage2D (dst->texture_target, 0,
                           ibounds.x1,
!                          dst->real_height -
!                          (ibounds.y1 + intermediate->height),
                           0, 0,
                           intermediate->width, intermediate->height);