-
Notifications
You must be signed in to change notification settings - Fork 54
/
clip-invariant.patch
1255 lines (1155 loc) · 37.3 KB
/
clip-invariant.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 2acc8b5..019249e 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -2012,13 +2012,14 @@ typedef struct _cairo_gl_surface_span_renderer {
cairo_gl_composite_setup_t setup;
+ int xmin, xmax;
+
cairo_operator_t op;
cairo_antialias_t antialias;
cairo_gl_surface_t *dst;
cairo_region_t *clip;
- cairo_composite_rectangles_t composite_rectangles;
GLuint vbo;
void *vbo_base;
unsigned int vbo_size;
@@ -2049,11 +2050,11 @@ _cairo_gl_span_renderer_flush (cairo_gl_surface_span_renderer_t *renderer)
cairo_region_get_rectangle (renderer->clip, i, &rect);
glScissor (rect.x, rect.y, rect.width, rect.height);
- glDrawArrays (GL_LINES, 0, count);
+ glDrawArrays (GL_QUADS, 0, count);
}
glDisable (GL_SCISSOR_TEST);
} else {
- glDrawArrays (GL_LINES, 0, count);
+ glDrawArrays (GL_QUADS, 0, count);
}
}
@@ -2134,72 +2135,87 @@ _cairo_gl_emit_span_vertex (cairo_gl_surface_span_renderer_t *renderer,
static void
_cairo_gl_emit_span (cairo_gl_surface_span_renderer_t *renderer,
- int x1, int x2, int y, uint8_t alpha)
+ int x, int y1, int y2,
+ uint8_t alpha)
{
float *vertices = _cairo_gl_span_renderer_get_vbo (renderer, 2);
- _cairo_gl_emit_span_vertex (renderer, x1, y, alpha, vertices);
- _cairo_gl_emit_span_vertex (renderer, x2, y, alpha,
+ _cairo_gl_emit_span_vertex (renderer, x, y1, alpha, vertices);
+ _cairo_gl_emit_span_vertex (renderer, x, y2, alpha,
vertices + renderer->vertex_size / 4);
}
-/* Emits the contents of the span renderer rows as GL_LINES with the span's
- * alpha.
- *
- * Unlike the image surface, which is compositing into a temporary, we emit
- * coverage even for alpha == 0, in case we're using an unbounded operator.
- * But it means we avoid having to do the fixup.
- */
+static void
+_cairo_gl_emit_rectangle (cairo_gl_surface_span_renderer_t *renderer,
+ int x1, int y1,
+ int x2, int y2,
+ int coverage)
+{
+ _cairo_gl_emit_span (renderer, x1, y1, y2, coverage);
+ _cairo_gl_emit_span (renderer, x2, y2, y1, coverage);
+}
+
static cairo_status_t
-_cairo_gl_surface_span_renderer_render_row (
- void *abstract_renderer,
- int y,
- const cairo_half_open_span_t *spans,
- unsigned num_spans)
+_cairo_gl_render_bounded_spans (void *abstract_renderer,
+ int y, int height,
+ const cairo_half_open_span_t *spans,
+ unsigned num_spans)
{
cairo_gl_surface_span_renderer_t *renderer = abstract_renderer;
- int xmin = renderer->composite_rectangles.mask.x;
- int xmax = xmin + renderer->composite_rectangles.width;
- int prev_x = xmin;
- int prev_alpha = 0;
- unsigned i;
- int x_translate;
-
- /* Make sure we're within y-range. */
- if (y < renderer->composite_rectangles.mask.y ||
- y >= renderer->composite_rectangles.mask.y +
- renderer->composite_rectangles.height)
+
+ if (num_spans == 0)
return CAIRO_STATUS_SUCCESS;
- x_translate = renderer->composite_rectangles.dst.x -
- renderer->composite_rectangles.mask.x;
- y += renderer->composite_rectangles.dst.y -
- renderer->composite_rectangles.mask.y;
+ do {
+ if (spans[0].coverage) {
+ _cairo_gl_emit_rectangle (renderer,
+ spans[0].x, y,
+ spans[1].x, y + height,
+ spans[0].coverage);
+ }
- /* Find the first span within x-range. */
- for (i=0; i < num_spans && spans[i].x < xmin; i++) {}
- if (i>0)
- prev_alpha = spans[i-1].coverage;
+ spans++;
+ } while (--num_spans > 1);
- /* Set the intermediate spans. */
- for (; i < num_spans; i++) {
- int x = spans[i].x;
+ return CAIRO_STATUS_SUCCESS;
+}
- if (x >= xmax)
- break;
+static cairo_status_t
+_cairo_gl_render_unbounded_spans (void *abstract_renderer,
+ int y, int height,
+ const cairo_half_open_span_t *spans,
+ unsigned num_spans)
+{
+ cairo_gl_surface_span_renderer_t *renderer = abstract_renderer;
- _cairo_gl_emit_span (renderer,
- prev_x + x_translate, x + x_translate, y,
- prev_alpha);
+ if (num_spans == 0) {
+ _cairo_gl_emit_rectangle (renderer,
+ renderer->xmin, y,
+ renderer->xmax, y + height,
+ 0);
+ return CAIRO_STATUS_SUCCESS;
+ }
- prev_x = x;
- prev_alpha = spans[i].coverage;
+ if (spans[0].x != renderer->xmin) {
+ _cairo_gl_emit_rectangle (renderer,
+ renderer->xmin, y,
+ spans[0].x, y + height,
+ 0);
}
- if (prev_x < xmax) {
- _cairo_gl_emit_span (renderer,
- prev_x + x_translate, xmax + x_translate, y,
- prev_alpha);
+ do {
+ _cairo_gl_emit_rectangle (renderer,
+ spans[0].x, y,
+ spans[1].x, y + height,
+ spans[0].coverage);
+ spans++;
+ } while (--num_spans > 1);
+
+ if (spans[0].x != renderer->xmax) {
+ _cairo_gl_emit_rectangle (renderer,
+ spans[0].x, y,
+ renderer->xmax, y + height,
+ 0);
}
return CAIRO_STATUS_SUCCESS;
@@ -2274,8 +2290,6 @@ _cairo_gl_surface_create_span_renderer (cairo_operator_t op,
cairo_gl_surface_t *dst = abstract_dst;
cairo_gl_surface_span_renderer_t *renderer;
cairo_status_t status;
- int width = rects->width;
- int height = rects->height;
cairo_surface_attributes_t *src_attributes;
GLenum err;
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 48d8013..d52979d 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -1390,11 +1390,13 @@ typedef struct _cairo_image_surface_span_renderer {
const cairo_pattern_t *pattern;
cairo_antialias_t antialias;
+ uint8_t *mask_data;
+ uint32_t mask_stride;
+
cairo_image_surface_t *src;
cairo_surface_attributes_t src_attributes;
cairo_image_surface_t *mask;
cairo_image_surface_t *dst;
-
cairo_composite_rectangles_t composite_rectangles;
} cairo_image_surface_span_renderer_t;
@@ -1403,66 +1405,46 @@ _cairo_image_surface_span_render_row (
int y,
const cairo_half_open_span_t *spans,
unsigned num_spans,
- cairo_image_surface_t *mask,
- const cairo_composite_rectangles_t *rects)
+ uint8_t *data,
+ uint32_t stride)
{
- int xmin = rects->mask.x;
- int xmax = xmin + rects->width;
uint8_t *row;
- int prev_x = xmin;
- int prev_alpha = 0;
unsigned i;
- /* Make sure we're within y-range. */
- y -= rects->mask.y;
- if (y < 0 || y >= rects->height)
+ if (num_spans == 0)
return;
- row = (uint8_t*)(mask->data) + y*(size_t)mask->stride - xmin;
-
- /* Find the first span within x-range. */
- for (i=0; i < num_spans && spans[i].x < xmin; i++) {}
- if (i>0)
- prev_alpha = spans[i-1].coverage;
-
- /* Set the intermediate spans. */
- for (; i < num_spans; i++) {
- int x = spans[i].x;
-
- if (x >= xmax)
- break;
-
- if (prev_alpha != 0) {
- /* We implement setting rendering the most common single
- * pixel wide span case to avoid the overhead of a memset
- * call. Open coding setting longer spans didn't show a
- * noticeable improvement over memset. */
- if (x == prev_x + 1) {
- row[prev_x] = prev_alpha;
- }
- else {
- memset(row + prev_x, prev_alpha, x - prev_x);
- }
+ row = data + y * stride;
+ for (i = 0; i < num_spans - 1; i++) {
+ if (! spans[i].coverage)
+ continue;
+
+ /* We implement setting the most common single pixel wide
+ * span case to avoid the overhead of a memset call.
+ * Open coding setting longer spans didn't show a
+ * noticeable improvement over memset.
+ */
+ if (spans[i+1].x == spans[i].x + 1) {
+ row[spans[i].x] = spans[i].coverage;
+ } else {
+ memset (row + spans[i].x,
+ spans[i].coverage,
+ spans[i+1].x - spans[i].x);
}
-
- prev_x = x;
- prev_alpha = spans[i].coverage;
- }
-
- if (prev_alpha != 0 && prev_x < xmax) {
- memset(row + prev_x, prev_alpha, xmax - prev_x);
}
}
static cairo_status_t
-_cairo_image_surface_span_renderer_render_row (
+_cairo_image_surface_span_renderer_render_rows (
void *abstract_renderer,
int y,
+ int height,
const cairo_half_open_span_t *spans,
unsigned num_spans)
{
cairo_image_surface_span_renderer_t *renderer = abstract_renderer;
- _cairo_image_surface_span_render_row (y, spans, num_spans, renderer->mask, &renderer->composite_rectangles);
+ while (height--)
+ _cairo_image_surface_span_render_row (y++, spans, num_spans, renderer->mask_data, renderer->mask_stride);
return CAIRO_STATUS_SUCCESS;
}
@@ -1517,11 +1499,11 @@ _cairo_image_surface_span_renderer_finish (void *abstract_renderer)
&dst->base,
src_attributes,
src->width, src->height,
- rects->width, rects->height,
+ width, height,
rects->src.x, rects->src.y,
0, 0, /* mask.x, mask.y */
rects->dst.x, rects->dst.y,
- rects->width, rects->height,
+ width, height,
dst->clip_region);
}
}
@@ -1567,7 +1549,7 @@ _cairo_image_surface_create_span_renderer (cairo_operator_t op,
renderer->base.destroy = _cairo_image_surface_span_renderer_destroy;
renderer->base.finish = _cairo_image_surface_span_renderer_finish;
- renderer->base.render_row = _cairo_image_surface_span_renderer_render_row;
+ renderer->base.render_rows = _cairo_image_surface_span_renderer_render_rows;
renderer->op = op;
renderer->pattern = pattern;
renderer->antialias = antialias;
@@ -1604,6 +1586,9 @@ _cairo_image_surface_create_span_renderer (cairo_operator_t op,
_cairo_image_surface_span_renderer_destroy (renderer);
return _cairo_span_renderer_create_in_error (status);
}
+
+ renderer->mask_data = renderer->mask->data - rects->mask.x - rects->mask.y * renderer->mask->stride;
+ renderer->mask_stride = renderer->mask->stride;
return &renderer->base;
}
diff --git a/src/cairo-spans-private.h b/src/cairo-spans-private.h
index e29a567..af3b38c 100644
--- a/src/cairo-spans-private.h
+++ b/src/cairo-spans-private.h
@@ -47,26 +47,24 @@ typedef struct _cairo_half_open_span {
* surfaces if they want to composite spans instead of trapezoids. */
typedef struct _cairo_span_renderer cairo_span_renderer_t;
struct _cairo_span_renderer {
+ /* Private status variable. */
+ cairo_status_t status;
+
/* Called to destroy the renderer. */
cairo_destroy_func_t destroy;
- /* Render the spans on row y of the source by whatever compositing
- * method is required. The function should ignore spans outside
- * the bounding box set by the init() function. */
- cairo_status_t (*render_row)(
- void *abstract_renderer,
- int y,
- const cairo_half_open_span_t *coverages,
- unsigned num_coverages);
+ /* Render the spans on row y of the destination by whatever compositing
+ * method is required. */
+ cairo_warn cairo_status_t
+ (*render_rows) (void *abstract_renderer,
+ int y, int height,
+ const cairo_half_open_span_t *coverages,
+ unsigned num_coverages);
/* Called after all rows have been rendered to perform whatever
* final rendering step is required. This function is called just
* once before the renderer is destroyed. */
- cairo_status_t (*finish)(
- void *abstract_renderer);
-
- /* Private status variable. */
- cairo_status_t status;
+ cairo_status_t (*finish) (void *abstract_renderer);
};
/* Scan converter interface. */
diff --git a/src/cairo-spans.c b/src/cairo-spans.c
index af3b85f..69894c1 100644
--- a/src/cairo-spans.c
+++ b/src/cairo-spans.c
@@ -275,13 +275,15 @@ _cairo_scan_converter_create_in_error (cairo_status_t status)
}
static cairo_status_t
-_cairo_nil_span_renderer_render_row (
+_cairo_nil_span_renderer_render_rows (
void *abstract_renderer,
int y,
+ int height,
const cairo_half_open_span_t *coverages,
unsigned num_coverages)
{
(void) y;
+ (void) height;
(void) coverages;
(void) num_coverages;
return _cairo_span_renderer_status (abstract_renderer);
@@ -310,7 +312,7 @@ _cairo_span_renderer_set_error (
ASSERT_NOT_REACHED;
}
if (renderer->status == CAIRO_STATUS_SUCCESS) {
- renderer->render_row = _cairo_nil_span_renderer_render_row;
+ renderer->render_rows = _cairo_nil_span_renderer_render_rows;
renderer->finish = _cairo_nil_span_renderer_finish;
renderer->status = error;
}
diff --git a/src/cairo-tor-scan-converter.c b/src/cairo-tor-scan-converter.c
index 29262c2..2b9fb1b 100644
--- a/src/cairo-tor-scan-converter.c
+++ b/src/cairo-tor-scan-converter.c
@@ -128,27 +128,29 @@ blit_with_span_renderer(
cairo_span_renderer_t *span_renderer,
struct pool *span_pool,
int y,
+ int height,
int xmin,
int xmax);
static glitter_status_t
-blit_empty_with_span_renderer (cairo_span_renderer_t *renderer, int y);
+blit_empty_with_span_renderer (cairo_span_renderer_t *renderer, int y, int height);
#define GLITTER_BLIT_COVERAGES_ARGS \
cairo_span_renderer_t *span_renderer, \
struct pool *span_pool
-#define GLITTER_BLIT_COVERAGES(cells, y, xmin, xmax) do { \
+#define GLITTER_BLIT_COVERAGES(cells, y, height,xmin, xmax) do { \
cairo_status_t status = blit_with_span_renderer (cells, \
span_renderer, \
span_pool, \
- y, xmin, xmax); \
+ y, height, \
+ xmin, xmax); \
if (unlikely (status)) \
return status; \
} while (0)
-#define GLITTER_BLIT_COVERAGES_EMPTY(y, xmin, xmax) do { \
- cairo_status_t status = blit_empty_with_span_renderer (span_renderer, y); \
+#define GLITTER_BLIT_COVERAGES_EMPTY(y, height, xmin, xmax) do { \
+ cairo_status_t status = blit_empty_with_span_renderer (span_renderer, y, height); \
if (unlikely (status)) \
return status; \
} while (0)
@@ -309,8 +311,8 @@ typedef int grid_area_t;
#define UNROLL3(x) x x x
struct quorem {
- int quo;
- int rem;
+ int32_t quo;
+ int32_t rem;
};
/* Header for a chunk of memory in a memory pool. */
@@ -382,6 +384,7 @@ struct edge {
/* Original sign of the edge: +1 for downwards, -1 for upwards
* edges. */
int dir;
+ int vertical;
};
/* Number of subsample rows per y-bucket. Must be GRID_Y. */
@@ -389,18 +392,28 @@ struct edge {
#define EDGE_Y_BUCKET_INDEX(y, ymin) (((y) - (ymin))/EDGE_Y_BUCKET_HEIGHT)
+struct bucket {
+ /* Unsorted list of edges starting within this bucket. */
+ struct edge *edges;
+
+ /* Set to non-zero if there are edges starting strictly within the
+ * bucket. */
+ unsigned have_inside_edges;
+};
+
/* A collection of sorted and vertically clipped edges of the polygon.
* Edges are moved from the polygon to an active list while scan
* converting. */
struct polygon {
- /* The vertical clip extents. */
+ /* The clip extents. */
+ grid_scaled_x_t xmin, xmax;
grid_scaled_y_t ymin, ymax;
/* Array of edges all starting in the same bucket. An edge is put
* into bucket EDGE_BUCKET_INDEX(edge->ytop, polygon->ymin) when
* it is added to the polygon. */
- struct edge **y_buckets;
- struct edge *y_buckets_embedded[64];
+ struct bucket *y_buckets;
+ struct bucket y_buckets_embedded[64];
struct {
struct pool base[1];
@@ -702,7 +715,6 @@ static void
cell_list_fini(struct cell_list *cells)
{
pool_fini (cells->cell_pool.base);
- cell_list_init (cells);
}
/* Empty the cell list. This is called at the start of every pixel
@@ -715,6 +727,26 @@ cell_list_reset (struct cell_list *cells)
pool_reset (cells->cell_pool.base);
}
+static struct cell *
+cell_list_alloc (struct cell_list *cells,
+ struct cell **cursor,
+ struct cell *tail,
+ int x)
+{
+ struct cell *cell;
+
+ cell = pool_alloc (cells->cell_pool.base, sizeof (struct cell));
+ if (unlikely (NULL == cell))
+ return NULL;
+
+ *cursor = cell;
+ cell->next = tail;
+ cell->x = x;
+ cell->uncovered_area = 0;
+ cell->covered_height = 0;
+ return cell;
+}
+
/* Find a cell at the given x-coordinate. Returns %NULL if a new cell
* needed to be allocated but couldn't be. Cells must be found with
* non-decreasing x-coordinate until the cell list is rewound using
@@ -737,22 +769,10 @@ cell_list_find (struct cell_list *cells, int x)
}
cells->cursor = cursor;
- if (tail->x == x) {
+ if (tail->x == x)
return tail;
- } else {
- struct cell *cell;
-
- cell = pool_alloc (cells->cell_pool.base, sizeof (struct cell));
- if (unlikely (NULL == cell))
- return NULL;
- *cursor = cell;
- cell->next = tail;
- cell->x = x;
- cell->uncovered_area = 0;
- cell->covered_height = 0;
- return cell;
- }
+ return cell_list_alloc (cells, cursor, tail, x);
}
/* Find two cells at x1 and x2. This is exactly equivalent
@@ -832,9 +852,8 @@ cell_list_find_pair(struct cell_list *cells, int x1, int x2)
/* Add an unbounded subpixel span covering subpixels >= x to the
* coverage cells. */
static glitter_status_t
-cell_list_add_unbounded_subspan(
- struct cell_list *cells,
- grid_scaled_x_t x)
+cell_list_add_unbounded_subspan (struct cell_list *cells,
+ grid_scaled_x_t x)
{
struct cell *cell;
int ix, fx;
@@ -907,20 +926,24 @@ cell_list_render_edge(
struct edge *edge,
int sign)
{
- struct quorem x1 = edge->x;
- struct quorem x2 = x1;
grid_scaled_y_t y1, y2, dy;
grid_scaled_x_t dx;
int ix1, ix2;
grid_scaled_x_t fx1, fx2;
- x2.quo += edge->dxdy_full.quo;
- x2.rem += edge->dxdy_full.rem;
- if (x2.rem >= 0) {
- ++x2.quo;
- x2.rem -= edge->dy;
+ struct quorem x1 = edge->x;
+ struct quorem x2 = x1;
+
+ if (! edge->vertical) {
+ x2.quo += edge->dxdy_full.quo;
+ x2.rem += edge->dxdy_full.rem;
+ if (x2.rem >= 0) {
+ ++x2.quo;
+ x2.rem -= edge->dy;
+ }
+
+ edge->x = x2;
}
- edge->x = x2;
GRID_X_TO_INT_FRAC(x1.quo, ix1, fx1);
GRID_X_TO_INT_FRAC(x2.quo, ix2, fx2);
@@ -1026,6 +1049,7 @@ static void
polygon_init (struct polygon *polygon)
{
polygon->ymin = polygon->ymax = 0;
+ polygon->xmin = polygon->xmax = 0;
polygon->y_buckets = polygon->y_buckets_embedded;
pool_init (polygon->edge_pool.base,
8192 - sizeof (struct _pool_chunk),
@@ -1045,10 +1069,11 @@ polygon_fini (struct polygon *polygon)
* receive new edges and clip them to the vertical range
* [ymin,ymax). */
static glitter_status_t
-polygon_reset(
- struct polygon *polygon,
- grid_scaled_y_t ymin,
- grid_scaled_y_t ymax)
+polygon_reset (struct polygon *polygon,
+ grid_scaled_x_t xmin,
+ grid_scaled_x_t xmax,
+ grid_scaled_y_t ymin,
+ grid_scaled_y_t ymax)
{
unsigned h = ymax - ymin;
unsigned num_buckets = EDGE_Y_BUCKET_INDEX(ymax + EDGE_Y_BUCKET_HEIGHT-1,
@@ -1065,14 +1090,16 @@ polygon_reset(
polygon->y_buckets = polygon->y_buckets_embedded;
if (num_buckets > ARRAY_LENGTH (polygon->y_buckets_embedded)) {
polygon->y_buckets = _cairo_malloc_ab (num_buckets,
- sizeof (struct edge *));
+ sizeof (struct bucket));
if (unlikely (NULL == polygon->y_buckets))
goto bail_no_mem;
}
- memset (polygon->y_buckets, 0, num_buckets * sizeof (struct edge *));
+ memset (polygon->y_buckets, 0, num_buckets * sizeof (struct bucket));
polygon->ymin = ymin;
polygon->ymax = ymax;
+ polygon->xmin = xmin;
+ polygon->xmax = xmax;
return GLITTER_STATUS_SUCCESS;
bail_no_mem:
@@ -1086,10 +1113,13 @@ _polygon_insert_edge_into_its_y_bucket(
struct polygon *polygon,
struct edge *e)
{
- unsigned ix = EDGE_Y_BUCKET_INDEX(e->ytop, polygon->ymin);
- struct edge **ptail = &polygon->y_buckets[ix];
+ unsigned j = e->ytop - polygon->ymin;
+ unsigned ix = j / EDGE_Y_BUCKET_HEIGHT;
+ unsigned offset = j % EDGE_Y_BUCKET_HEIGHT;
+ struct edge **ptail = &polygon->y_buckets[ix].edges;
e->next = *ptail;
*ptail = e;
+ polygon->y_buckets[ix].have_inside_edges |= offset;
}
inline static glitter_status_t
@@ -1115,30 +1145,53 @@ polygon_add_edge (struct polygon *polygon,
dx = edge->line.p2.x - edge->line.p1.x;
dy = edge->line.p2.y - edge->line.p1.y;
e->dy = dy;
- e->dxdy = floored_divrem (dx, dy);
-
- if (ymin <= edge->top)
- ytop = edge->top;
- else
- ytop = ymin;
- if (ytop == edge->line.p1.y) {
- e->x.quo = edge->line.p1.x;
- e->x.rem = 0;
- } else {
- e->x = floored_muldivrem (ytop - edge->line.p1.y, dx, dy);
- e->x.quo += edge->line.p1.x;
- }
-
e->dir = edge->dir;
+
+ ytop = edge->top >= ymin ? edge->top : ymin;
+ ybot = edge->bottom <= ymax ? edge->bottom : ymax;
e->ytop = ytop;
- ybot = edge->bottom < ymax ? edge->bottom : ymax;
e->height_left = ybot - ytop;
- if (e->height_left >= GRID_Y) {
- e->dxdy_full = floored_muldivrem (GRID_Y, dx, dy);
- } else {
+ if (dx == 0) {
+ e->vertical = TRUE;
+ e->x.quo = edge->line.p1.x;
+ e->x.rem = 0;
+ e->dxdy.quo = 0;
+ e->dxdy.rem = 0;
e->dxdy_full.quo = 0;
e->dxdy_full.rem = 0;
+
+ /* Drop edges to the right of the clip extents. */
+ if (e->x.quo >= polygon->xmax)
+ return GLITTER_STATUS_SUCCESS;
+
+ /* Offset vertical edges at the left side of the clip extents
+ * to just shy of the left side. We depend on this when
+ * checking for possible intersections within the clip
+ * rectangle. */
+ if (e->x.quo <= polygon->xmin) {
+ e->x.quo = polygon->xmin - 1;
+ }
+ } else {
+ e->vertical = FALSE;
+ e->dxdy = floored_divrem (dx, dy);
+ if (ytop == edge->line.p1.y) {
+ e->x.quo = edge->line.p1.x;
+ e->x.rem = 0;
+ } else {
+ e->x = floored_muldivrem (ytop - edge->line.p1.y, dx, dy);
+ e->x.quo += edge->line.p1.x;
+ }
+
+ if (e->x.quo >= polygon->xmax && e->dxdy.quo >= 0)
+ return GLITTER_STATUS_SUCCESS;
+
+ if (e->height_left >= GRID_Y) {
+ e->dxdy_full = floored_muldivrem (GRID_Y, dx, dy);
+ } else {
+ e->dxdy_full.quo = 0;
+ e->dxdy_full.rem = 0;
+ }
}
_polygon_insert_edge_into_its_y_bucket (polygon, e);
@@ -1161,31 +1214,30 @@ active_list_init(struct active_list *active)
active_list_reset(active);
}
-static void
-active_list_fini(
- struct active_list *active)
-{
- active_list_reset(active);
-}
-
/* Merge the edges in an unsorted list of edges into a sorted
* list. The sort order is edges ascending by edge->x.quo. Returns
* the new head of the sorted list. */
static struct edge *
merge_unsorted_edges(struct edge *sorted_head, struct edge *unsorted_head)
{
- struct edge *head = unsorted_head;
struct edge **cursor = &sorted_head;
int x;
- while (NULL != head) {
+ if (sorted_head == NULL) {
+ sorted_head = unsorted_head;
+ unsorted_head = unsorted_head->next;
+ sorted_head->next = NULL;
+ if (unsorted_head == NULL)
+ return sorted_head;
+ }
+
+ do {
+ struct edge *next = unsorted_head->next;
struct edge *prev = *cursor;
- struct edge *next = head->next;
- x = head->x.quo;
- if (NULL == prev || x < prev->x.quo) {
+ x = unsorted_head->x.quo;
+ if (x < prev->x.quo)
cursor = &sorted_head;
- }
while (1) {
UNROLL3({
@@ -1196,26 +1248,29 @@ merge_unsorted_edges(struct edge *sorted_head, struct edge *unsorted_head)
});
}
- head->next = *cursor;
- *cursor = head;
+ unsorted_head->next = *cursor;
+ *cursor = unsorted_head;
+ unsorted_head = next;
+ } while (unsorted_head != NULL);
- head = next;
- }
return sorted_head;
}
/* Test if the edges on the active list can be safely advanced by a
* full row without intersections or any edges ending. */
inline static int
-active_list_can_step_full_row(
- struct active_list *active)
+active_list_can_step_full_row (struct active_list *active,
+ grid_scaled_x_t xmin)
{
+ const struct edge *e;
+ grid_scaled_x_t prev_x = INT_MIN;
+
/* Recomputes the minimum height of all edges on the active
* list if we have been dropping edges. */
if (active->min_height <= 0) {
- struct edge *e = active->head;
int min_height = INT_MAX;
+ e = active->head;
while (NULL != e) {
if (e->height_left < min_height)
min_height = e->height_left;
@@ -1225,27 +1280,38 @@ active_list_can_step_full_row(
active->min_height = min_height;
}
- /* Check for intersections only if no edges end during the next
- * row. */
- if (active->min_height >= GRID_Y) {
- grid_scaled_x_t prev_x = INT_MIN;
- struct edge *e = active->head;
- while (NULL != e) {
- struct quorem x = e->x;
+ if (active->min_height < GRID_Y)
+ return 0;
+ /* Check for intersections as no edges end during the next row. */
+ e = active->head;
+ while (NULL != e) {
+ struct quorem x = e->x;
+
+ if (! e->vertical) {
x.quo += e->dxdy_full.quo;
x.rem += e->dxdy_full.rem;
if (x.rem >= 0)
++x.quo;
+ }
- if (x.quo <= prev_x)
+ /* There's may be an intersection if the edge sort order might
+ * change. */
+ if (x.quo <= prev_x) {
+ /* Ignore intersections to the left of the clip extents.
+ * This assumes that all vertical edges on or at the left
+ * side of the clip rectangle have been shifted slightly
+ * to the left in polygon_add_edge(). */
+ if (prev_x >= xmin || x.quo >= xmin || e->x.quo >= xmin)
return 0;
+ }
+ else {
prev_x = x.quo;
- e = e->next;
}
- return 1;
+ e = e->next;
}
- return 0;
+
+ return 1;
}
/* Merges edges on the given subpixel row from the polygon to the
@@ -1261,7 +1327,7 @@ active_list_merge_edges_from_polygon(
unsigned ix = EDGE_Y_BUCKET_INDEX(y, polygon->ymin);
int min_height = active->min_height;
struct edge *subrow_edges = NULL;
- struct edge **ptail = &polygon->y_buckets[ix];
+ struct edge **ptail = &polygon->y_buckets[ix].edges;
while (1) {
struct edge *tail = *ptail;
@@ -1277,8 +1343,10 @@ active_list_merge_edges_from_polygon(
ptail = &tail->next;
}
}
- active->head = merge_unsorted_edges(active->head, subrow_edges);
- active->min_height = min_height;
+ if (subrow_edges) {
+ active->head = merge_unsorted_edges(active->head, subrow_edges);
+ active->min_height = min_height;
+ }
}
/* Advance the edges on the active list by one subsample row by
@@ -1439,11 +1507,13 @@ apply_nonzero_fill_rule_and_step_edges (struct active_list *active,
}
}
- right_edge->x.quo += right_edge->dxdy_full.quo;
- right_edge->x.rem += right_edge->dxdy_full.rem;
- if (right_edge->x.rem >= 0) {
- ++right_edge->x.quo;
- right_edge->x.rem -= right_edge->dy;
+ if (! right_edge->vertical) {
+ right_edge->x.quo += right_edge->dxdy_full.quo;
+ right_edge->x.rem += right_edge->dxdy_full.rem;
+ if (right_edge->x.rem >= 0) {
+ ++right_edge->x.quo;
+ right_edge->x.rem -= right_edge->dy;
+ }
}
}
@@ -1472,6 +1542,7 @@ apply_evenodd_fill_rule_and_step_edges (struct active_list *active,
left_edge = *cursor;
while (NULL != left_edge) {
struct edge *right_edge;
+ int winding = left_edge->dir;
left_edge->height_left -= GRID_Y;
if (left_edge->height_left)
@@ -1490,17 +1561,22 @@ apply_evenodd_fill_rule_and_step_edges (struct active_list *active,
else
*cursor = right_edge->next;
+ winding += right_edge->dir;
+ if ((winding & 1) == 0) {
if (right_edge->next == NULL ||
right_edge->next->x.quo != right_edge->x.quo)
{
break;
}
+ }
- right_edge->x.quo += right_edge->dxdy_full.quo;
- right_edge->x.rem += right_edge->dxdy_full.rem;
- if (right_edge->x.rem >= 0) {
- ++right_edge->x.quo;
- right_edge->x.rem -= right_edge->dy;
+ if (! right_edge->vertical) {
+ right_edge->x.quo += right_edge->dxdy_full.quo;
+ right_edge->x.rem += right_edge->dxdy_full.rem;
+ if (right_edge->x.rem >= 0) {
+ ++right_edge->x.quo;
+ right_edge->x.rem -= right_edge->dy;
+ }
}
}
@@ -1537,8 +1613,14 @@ blit_span(
}
}
-#define GLITTER_BLIT_COVERAGES(coverages, y, xmin, xmax) \
- blit_cells(coverages, raster_pixels + (y)*raster_stride, xmin, xmax)
+#define GLITTER_BLIT_COVERAGES(coverages, y, height, xmin, xmax) \
+ do { \
+ int __y = y; \
+ int __h = height; \
+ do { \
+ blit_cells(coverages, raster_pixels + (__y)*raster_stride, xmin, xmax); \
+ } while (--__h); \
+ } while (0)
static void
blit_cells(
@@ -1597,7 +1679,6 @@ static void
_glitter_scan_converter_fini(glitter_scan_converter_t *converter)
{
polygon_fini(converter->polygon);
- active_list_fini(converter->active);
cell_list_fini(converter->coverages);
converter->xmin=0;
converter->ymin=0;
@@ -1641,7 +1722,7 @@ glitter_scan_converter_reset(
active_list_reset(converter->active);
cell_list_reset(converter->coverages);
- status = polygon_reset(converter->polygon, ymin, ymax);
+ status = polygon_reset(converter->polygon, xmin, xmax, ymin, ymax);
if (status)
return status;
@@ -1711,19 +1792,48 @@ glitter_scan_converter_add_edge (glitter_scan_converter_t *converter,
#endif
#ifndef GLITTER_BLIT_COVERAGES_EMPTY
-# define GLITTER_BLIT_COVERAGES_EMPTY(y, xmin, xmax)
+# define GLITTER_BLIT_COVERAGES_EMPTY(y0, y1, xmin, xmax)
#endif
+static cairo_bool_t
+active_list_is_vertical (struct active_list *active)
+{
+ struct edge *e;
+
+ for (e = active->head; e != NULL; e = e->next) {
+ if (! e->vertical)
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void
+step_edges (struct active_list *active, int count)
+{
+ struct edge **cursor = &active->head;
+ struct edge *edge;
+
+ for (edge = *cursor; edge != NULL; edge = *cursor) {
+ edge->height_left -= GRID_Y * count;
+ if (edge->height_left)
+ cursor = &edge->next;
+ else
+ *cursor = edge->next;
+ }
+}
+
I glitter_status_t
glitter_scan_converter_render(
glitter_scan_converter_t *converter,