[cairo-commit] libglc/src glc.c,1.1.1.1,1.2 glc_rect.c,1.1.1.1,1.2 glc_surface.c,1.1.1.1,1.2 glc_trap.c,1.1.1.1,1.2 glc_tri.c,1.1.1.1,1.2 glcint.h,1.1.1.1,1.2
David Reveman
commit at pdx.freedesktop.org
Mon Dec 1 04:21:12 PST 2003
Committed by: davidr
Update of /cvs/cairo/libglc/src
In directory pdx:/tmp/cvs-serv2956/src
Modified Files:
glc.c glc_rect.c glc_surface.c glc_trap.c glc_tri.c glcint.h
Log Message:
Removed unwanted transformations
Index: glc.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc.c 27 Nov 2003 11:46:41 -0000 1.1.1.1
--- glc.c 1 Dec 2003 12:21:10 -0000 1.2
***************
*** 141,149 ****
width = mask_surface->width;
height = mask_surface->height;
!
glc_composite (GLC_OPERATOR_MASK,
src, NULL, mask_surface,
x_src, y_src, 0, 0, 0, 0,
mask_surface->width, mask_surface->height);
src = mask_surface;
--- 141,151 ----
width = mask_surface->width;
height = mask_surface->height;
!
! glc_surface_disable_transform (src);
glc_composite (GLC_OPERATOR_MASK,
src, NULL, mask_surface,
x_src, y_src, 0, 0, 0, 0,
mask_surface->width, mask_surface->height);
+ glc_surface_enable_transform (src);
src = mask_surface;
***************
*** 290,294 ****
}
! if (src->transform) {
glMatrixMode (GL_MODELVIEW);
glPushMatrix ();
--- 292,296 ----
}
! if (src->transform && (!src->disable_transform)) {
glMatrixMode (GL_MODELVIEW);
glPushMatrix ();
Index: glc_rect.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_rect.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc_rect.c 27 Nov 2003 11:46:15 -0000 1.1.1.1
--- glc_rect.c 1 Dec 2003 12:21:10 -0000 1.2
***************
*** 96,100 ****
x += x_draw_offset;
y += y_draw_offset;
!
glc_composite (GLC_OPERATOR_SRC,
dst,
--- 96,101 ----
x += x_draw_offset;
y += y_draw_offset;
!
! glc_surface_disable_transform (dst);
glc_composite (GLC_OPERATOR_SRC,
dst,
***************
*** 105,108 ****
--- 106,110 ----
0, 0,
intermediate->width, intermediate->height);
+ glc_surface_enable_transform (dst);
} else
surface = dst;
***************
*** 180,184 ****
return;
}
!
glc_composite (GLC_OPERATOR_SRC,
dst,
--- 182,187 ----
return;
}
!
! glc_surface_disable_transform (dst);
glc_composite (GLC_OPERATOR_SRC,
dst,
***************
*** 189,192 ****
--- 192,196 ----
0, 0,
intermediate->width, intermediate->height);
+ glc_surface_disable_transform (dst);
} else
surface = dst;
Index: glc_surface.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_surface.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc_surface.c 27 Nov 2003 11:46:15 -0000 1.1.1.1
--- glc_surface.c 1 Dec 2003 12:21:10 -0000 1.2
***************
*** 43,46 ****
--- 43,47 ----
surface->repeat = 0;
surface->transform = NULL;
+ surface->disable_transform = 0;
surface->filter = GLC_FILTER_NEAREST;
surface->polyedge = GLC_POLYEDGE_SHARP;
***************
*** 181,184 ****
--- 182,197 ----
void
+ glc_surface_disable_transform (glc_surface_t *surface)
+ {
+ surface->disable_transform = 1;
+ }
+
+ void
+ glc_surface_enable_transform (glc_surface_t *surface)
+ {
+ surface->disable_transform = 0;
+ }
+
+ void
glc_surface_setup_environment (glc_surface_t *surface)
{
Index: glc_trap.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_trap.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc_trap.c 27 Nov 2003 11:45:42 -0000 1.1.1.1
--- glc_trap.c 1 Dec 2003 12:21:10 -0000 1.2
***************
*** 109,119 ****
int x_draw_offset, y_draw_offset;
- /*
- if (src->display != dst->display || src->screen != dst->screen) {
- glc_status_add (GLC_STATUS_UNRELATED_SURFACES_MASK);
- return;
- }
- */
-
glc_trapezoid_bounds (n_traps, traps, &bounds);
if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2 ||
--- 109,112 ----
***************
*** 276,280 ****
return;
}
!
glc_composite (GLC_OPERATOR_SRC,
dst,
--- 269,274 ----
return;
}
!
! glc_surface_disable_transform (dst);
glc_composite (GLC_OPERATOR_SRC,
dst,
***************
*** 285,288 ****
--- 279,283 ----
0, 0,
intermediate->width, intermediate->height);
+ glc_surface_enable_transform (dst);
} else
surface = dst;
Index: glc_tri.c
===================================================================
RCS file: /cvs/cairo/libglc/src/glc_tri.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glc_tri.c 27 Nov 2003 11:47:15 -0000 1.1.1.1
--- glc_tri.c 1 Dec 2003 12:21:10 -0000 1.2
***************
*** 75,85 ****
int x_draw_offset, y_draw_offset;
- /*
- if (src->display != dst->display || src->screen != dst->screen) {
- glc_status_add (GLC_STATUS_UNRELATED_SURFACES_MASK);
- return;
- }
- */
-
glc_point_fixed_bounds (n_tris * 3, (glc_point_fixed_t *) tris, &bounds);
if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2 ||
--- 75,78 ----
***************
*** 173,183 ****
int x_draw_offset, y_draw_offset;
- /*
- if (src->display != dst->display || src->screen != dst->screen) {
- glc_status_add (GLC_STATUS_UNRELATED_SURFACES_MASK);
- return;
- }
- */
-
if (n_points < 3)
return;
--- 166,169 ----
***************
*** 272,282 ****
return;
- /*
- if (src->display != dst->display || src->screen != dst->screen) {
- glc_status_add (GLC_STATUS_UNRELATED_SURFACES_MASK);
- return;
- }
- */
-
glc_point_fixed_bounds (n_points, points, &bounds);
if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2 ||
--- 258,261 ----
***************
*** 439,443 ****
return;
}
!
glc_composite (GLC_OPERATOR_SRC,
dst,
--- 418,423 ----
return;
}
!
! glc_surface_disable_transform (dst);
glc_composite (GLC_OPERATOR_SRC,
dst,
***************
*** 448,451 ****
--- 428,432 ----
0, 0,
intermediate->width, intermediate->height);
+ glc_surface_enable_transform (dst);
} else
surface = dst;
Index: glcint.h
===================================================================
RCS file: /cvs/cairo/libglc/src/glcint.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glcint.h 27 Nov 2003 11:47:05 -0000 1.1.1.1
--- glcint.h 1 Dec 2003 12:21:10 -0000 1.2
***************
*** 78,81 ****
--- 78,82 ----
glc_polyedge_t polyedge;
double *transform;
+ glc_bool_t disable_transform;
int width, height;
int real_width, real_height;
***************
*** 134,137 ****
--- 135,144 ----
extern void __internal_linkage
+ glc_surface_disable_transform (glc_surface_t *surface);
+
+ extern void __internal_linkage
+ glc_surface_enable_transform (glc_surface_t *surface);
+
+ extern void __internal_linkage
glc_surface_setup_environment (glc_surface_t *surface);
More information about the cairo-commit
mailing list