commit cbf104a
Michael Forney
·
2013-09-11 01:29:33 +0000 UTC
parent af4885f
Style: Remove redundant static declaration
M
intel.c
+15,
-17
1@@ -216,9 +216,8 @@ int intel_export(struct drm_drawable * drawable)
2 return prime_fd;
3 }
4
5-static void intel_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
6- int32_t x, int32_t y,
7- uint32_t width, uint32_t height)
8+void intel_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
9+ int32_t x, int32_t y, uint32_t width, uint32_t height)
10 {
11 struct intel_drawable * intel = (void *) drawable;
12
13@@ -226,11 +225,11 @@ static void intel_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
14 x, y, x + width, y + height, color);
15 }
16
17-static void intel_copy_rectangle(struct wld_drawable * src_drawable,
18- struct wld_drawable * dst_drawable,
19- int32_t src_x, int32_t src_y,
20- int32_t dst_x, int32_t dst_y,
21- uint32_t width, uint32_t height)
22+void intel_copy_rectangle(struct wld_drawable * src_drawable,
23+ struct wld_drawable * dst_drawable,
24+ int32_t src_x, int32_t src_y,
25+ int32_t dst_x, int32_t dst_y,
26+ uint32_t width, uint32_t height)
27 {
28 struct intel_drawable * src = (void *) src_drawable;
29 struct intel_drawable * dst = (void *) dst_drawable;
30@@ -240,11 +239,11 @@ static void intel_copy_rectangle(struct wld_drawable * src_drawable,
31 dst->bo, dst->drm.base.pitch, dst_x, dst_y, width, height);
32 }
33
34-static void intel_draw_text_utf8(struct wld_drawable * drawable,
35- struct font * font, uint32_t color,
36- int32_t x, int32_t y,
37- const char * text, int32_t length,
38- struct wld_extents * extents)
39+void intel_draw_text_utf8(struct wld_drawable * drawable,
40+ struct font * font, uint32_t color,
41+ int32_t x, int32_t y,
42+ const char * text, int32_t length,
43+ struct wld_extents * extents)
44 {
45 struct intel_drawable * intel = (void *) drawable;
46 int ret;
47@@ -309,8 +308,7 @@ static void intel_draw_text_utf8(struct wld_drawable * drawable,
48 extents->advance = origin_x - x;
49 }
50
51-static void intel_write(struct wld_drawable * drawable,
52- const void * data, size_t size)
53+void intel_write(struct wld_drawable * drawable, const void * data, size_t size)
54 {
55 struct intel_drawable * intel = (void *) drawable;
56
57@@ -344,14 +342,14 @@ pixman_image_t * intel_map(struct wld_drawable * drawable)
58 return intel->virtual;
59 }
60
61-static void intel_flush(struct wld_drawable * drawable)
62+void intel_flush(struct wld_drawable * drawable)
63 {
64 struct intel_drawable * intel = (void *) drawable;
65
66 intel_batch_flush(&intel->context->batch);
67 }
68
69-static void intel_destroy(struct wld_drawable * drawable)
70+void intel_destroy(struct wld_drawable * drawable)
71 {
72 struct intel_drawable * intel = (void *) drawable;
73 drm_intel_bo_unreference(intel->bo);
M
pixman.c
+23,
-23
1@@ -136,9 +136,9 @@ struct wld_drawable * wld_pixman_create_drawable
2 return NULL;
3 }
4
5-static void pixman_fill_rectangle(struct wld_drawable * drawable,
6- uint32_t color, int32_t x, int32_t y,
7- uint32_t width, uint32_t height)
8+void pixman_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
9+ int32_t x, int32_t y,
10+ uint32_t width, uint32_t height)
11 {
12 struct pixman_drawable * pixman = (void *) drawable;
13 pixman_color_t pixman_color = PIXMAN_COLOR(color);
14@@ -148,8 +148,8 @@ static void pixman_fill_rectangle(struct wld_drawable * drawable,
15 1, &box);
16 }
17
18-static void pixman_fill_region(struct wld_drawable * drawable, uint32_t color,
19- pixman_region32_t * region)
20+void pixman_fill_region(struct wld_drawable * drawable, uint32_t color,
21+ pixman_region32_t * region)
22 {
23 struct pixman_drawable * pixman = (void *) drawable;
24 pixman_color_t pixman_color = PIXMAN_COLOR(color);
25@@ -161,11 +161,11 @@ static void pixman_fill_region(struct wld_drawable * drawable, uint32_t color,
26 num_boxes, boxes);
27 }
28
29-static void pixman_copy_rectangle(struct wld_drawable * src_drawable,
30- struct wld_drawable * dst_drawable,
31- int32_t src_x, int32_t src_y,
32- int32_t dst_x, int32_t dst_y,
33- uint32_t width, uint32_t height)
34+void pixman_copy_rectangle(struct wld_drawable * src_drawable,
35+ struct wld_drawable * dst_drawable,
36+ int32_t src_x, int32_t src_y,
37+ int32_t dst_x, int32_t dst_y,
38+ uint32_t width, uint32_t height)
39 {
40 struct pixman_drawable * src = (void *) src_drawable;
41 struct pixman_drawable * dst = (void *) dst_drawable;
42@@ -174,10 +174,10 @@ static void pixman_copy_rectangle(struct wld_drawable * src_drawable,
43 src_x, src_y, 0, 0, dst_x, dst_y, width, height);
44 }
45
46-static void pixman_copy_region(struct wld_drawable * src_drawable,
47- struct wld_drawable * dst_drawable,
48- pixman_region32_t * region,
49- int32_t dst_x, int32_t dst_y)
50+void pixman_copy_region(struct wld_drawable * src_drawable,
51+ struct wld_drawable * dst_drawable,
52+ pixman_region32_t * region,
53+ int32_t dst_x, int32_t dst_y)
54 {
55 struct pixman_drawable * src = (void *) src_drawable;
56 struct pixman_drawable * dst = (void *) dst_drawable;
57@@ -201,11 +201,11 @@ static inline uint8_t reverse(uint8_t byte)
58 return byte;
59 }
60
61-static void pixman_draw_text_utf8(struct wld_drawable * drawable,
62- struct font * font, uint32_t color,
63- int32_t x, int32_t y,
64- const char * text, int32_t length,
65- struct wld_extents * extents)
66+void pixman_draw_text_utf8(struct wld_drawable * drawable,
67+ struct font * font, uint32_t color,
68+ int32_t x, int32_t y,
69+ const char * text, int32_t length,
70+ struct wld_extents * extents)
71 {
72 struct pixman_drawable * pixman = (void *) drawable;
73 int ret;
74@@ -294,8 +294,8 @@ static void pixman_draw_text_utf8(struct wld_drawable * drawable,
75 extents->advance = origin_x;
76 }
77
78-static void pixman_write(struct wld_drawable * drawable,
79- const void * data, size_t size)
80+void pixman_write(struct wld_drawable * drawable,
81+ const void * data, size_t size)
82 {
83 struct pixman_drawable * pixman = (void *) drawable;
84
85@@ -309,11 +309,11 @@ pixman_image_t * pixman_map(struct wld_drawable * drawable)
86 return pixman_image_ref(pixman->image);
87 }
88
89-static void pixman_flush(struct wld_drawable * drawable)
90+void pixman_flush(struct wld_drawable * drawable)
91 {
92 }
93
94-static void pixman_destroy(struct wld_drawable * drawable)
95+void pixman_destroy(struct wld_drawable * drawable)
96 {
97 struct pixman_drawable * pixman = (void *) drawable;
98
+21,
-21
1@@ -324,9 +324,9 @@ static void begin(struct wayland_drawable * wayland)
2 }
3 }
4
5-static void wayland_fill_rectangle(struct wld_drawable * drawable,
6- uint32_t color, int32_t x, int32_t y,
7- uint32_t width, uint32_t height)
8+void wayland_fill_rectangle(struct wld_drawable * drawable, uint32_t color,
9+ int32_t x, int32_t y,
10+ uint32_t width, uint32_t height)
11 {
12 struct wayland_drawable * wayland = (void *) drawable;
13
14@@ -341,8 +341,8 @@ static void wayland_fill_rectangle(struct wld_drawable * drawable,
15 }
16 }
17
18-static void wayland_fill_region(struct wld_drawable * drawable, uint32_t color,
19- pixman_region32_t * region)
20+void wayland_fill_region(struct wld_drawable * drawable, uint32_t color,
21+ pixman_region32_t * region)
22 {
23 struct wayland_drawable * wayland = (void *) drawable;
24
25@@ -356,28 +356,28 @@ static void wayland_fill_region(struct wld_drawable * drawable, uint32_t color,
26 }
27 }
28
29-static void wayland_copy_rectangle(struct wld_drawable * src_drawable,
30- struct wld_drawable * dst_drawable,
31- int32_t src_x, int32_t src_y,
32- int32_t dst_x, int32_t dst_y,
33- uint32_t width, uint32_t height)
34+void wayland_copy_rectangle(struct wld_drawable * src_drawable,
35+ struct wld_drawable * dst_drawable,
36+ int32_t src_x, int32_t src_y,
37+ int32_t dst_x, int32_t dst_y,
38+ uint32_t width, uint32_t height)
39 {
40 fprintf(stderr, "wayland: Copy rectangle is not implemented\n");
41 }
42
43-static void wayland_copy_region(struct wld_drawable * src_drawable,
44- struct wld_drawable * dst_drawable,
45- pixman_region32_t * region,
46- int32_t dst_x, int32_t dst_y)
47+void wayland_copy_region(struct wld_drawable * src_drawable,
48+ struct wld_drawable * dst_drawable,
49+ pixman_region32_t * region,
50+ int32_t dst_x, int32_t dst_y)
51 {
52 fprintf(stderr, "wayland: Copy region is not implemented\n");
53 }
54
55-static void wayland_draw_text_utf8(struct wld_drawable * drawable,
56- struct font * font, uint32_t color,
57- int32_t x, int32_t y,
58- const char * text, int32_t length,
59- struct wld_extents * extents)
60+void wayland_draw_text_utf8(struct wld_drawable * drawable,
61+ struct font * font, uint32_t color,
62+ int32_t x, int32_t y,
63+ const char * text, int32_t length,
64+ struct wld_extents * extents)
65 {
66 struct wld_extents extents0;
67 struct wayland_drawable * wayland = (void *) drawable;
68@@ -398,7 +398,7 @@ static void wayland_draw_text_utf8(struct wld_drawable * drawable,
69 }
70 }
71
72-static void wayland_flush(struct wld_drawable * drawable)
73+void wayland_flush(struct wld_drawable * drawable)
74 {
75 struct wayland_drawable * wayland = (void *) drawable;
76 pixman_region32_t damage;
77@@ -430,7 +430,7 @@ static void wayland_flush(struct wld_drawable * drawable)
78 wayland->front_buffer ^= 1;
79 }
80
81-static void wayland_destroy(struct wld_drawable * drawable)
82+void wayland_destroy(struct wld_drawable * drawable)
83 {
84 struct wayland_drawable * wayland = (void *) drawable;
85