commit 769b925
Michael Forney
·
2019-07-11 04:05:18 +0000 UTC
parent 81232b2
Style changes
M
buffer.c
+12,
-17
1@@ -35,8 +35,8 @@ buffer_initialize(struct buffer *buffer,
2 buffer->base.format = format;
3 buffer->base.pitch = pitch;
4 buffer->base.map = NULL;
5- buffer->references = 1;
6- buffer->map_references = 0;
7+ buffer->ref = 1;
8+ buffer->map_ref = 0;
9 buffer->exporters = NULL;
10 buffer->destructors = NULL;
11 pixman_region32_init_rect(&buffer->base.damage, 0, 0, width, height);
12@@ -48,10 +48,10 @@ wld_map(struct wld_buffer *base)
13 {
14 struct buffer *buffer = (void *)base;
15
16- if (buffer->map_references == 0 && !buffer->base.impl->map(buffer))
17+ if (buffer->map_ref == 0 && !buffer->base.impl->map(buffer))
18 return false;
19
20- ++buffer->map_references;
21+ ++buffer->map_ref;
22 return true;
23 }
24
25@@ -61,19 +61,16 @@ wld_unmap(struct wld_buffer *base)
26 {
27 struct buffer *buffer = (void *)base;
28
29- if (buffer->map_references == 0
30- || (buffer->map_references == 1 && !buffer->base.impl->unmap(buffer))) {
31+ if (buffer->map_ref == 0 || (buffer->map_ref == 1 && !buffer->base.impl->unmap(buffer)))
32 return false;
33- }
34
35- --buffer->map_references;
36+ --buffer->map_ref;
37 return true;
38 }
39
40 EXPORT
41 bool
42-wld_export(struct wld_buffer *base,
43- uint32_t type, union wld_object *object)
44+wld_export(struct wld_buffer *base, uint32_t type, union wld_object *object)
45 {
46 struct buffer *buffer = (void *)base;
47 struct wld_exporter *exporter;
48@@ -88,8 +85,7 @@ wld_export(struct wld_buffer *base,
49
50 EXPORT
51 void
52-wld_buffer_add_exporter(struct wld_buffer *base,
53- struct wld_exporter *exporter)
54+wld_buffer_add_exporter(struct wld_buffer *base, struct wld_exporter *exporter)
55 {
56 struct buffer *buffer = (void *)base;
57
58@@ -99,8 +95,7 @@ wld_buffer_add_exporter(struct wld_buffer *base,
59
60 EXPORT
61 void
62-wld_buffer_add_destructor(struct wld_buffer *base,
63- struct wld_destructor *destructor)
64+wld_buffer_add_destructor(struct wld_buffer *base, struct wld_destructor *destructor)
65 {
66 struct buffer *buffer = (void *)base;
67
68@@ -114,7 +109,7 @@ wld_buffer_reference(struct wld_buffer *base)
69 {
70 struct buffer *buffer = (void *)base;
71
72- ++buffer->references;
73+ ++buffer->ref;
74 }
75
76 EXPORT
77@@ -124,7 +119,7 @@ wld_buffer_unreference(struct wld_buffer *base)
78 struct buffer *buffer = (void *)base;
79 struct wld_destructor *destructor, *next;
80
81- if (--buffer->references > 0)
82+ if (--buffer->ref > 0)
83 return;
84
85 pixman_region32_fini(&buffer->base.damage);
86@@ -134,7 +129,7 @@ wld_buffer_unreference(struct wld_buffer *base)
87 destructor->destroy(destructor);
88 }
89
90- if (buffer->map_references > 0)
91+ if (buffer->map_ref > 0)
92 buffer->base.impl->unmap(buffer);
93
94 buffer->base.impl->destroy(buffer);
+1,
-2
1@@ -70,8 +70,7 @@ buffered_surface_create(struct wld_context *context, uint32_t width, uint32_t he
2 }
3
4 pixman_region32_t *
5-surface_damage(struct wld_surface *base,
6- pixman_region32_t *new_damage)
7+surface_damage(struct wld_surface *base, pixman_region32_t *new_damage)
8 {
9 struct buffered_surface *surface = buffered_surface(base);
10 struct buffer *back_buffer;
+1,
-2
1@@ -24,8 +24,7 @@
2 #include "wld-private.h"
3
4 void
5-context_initialize(struct wld_context *context,
6- const struct wld_context_impl *impl)
7+context_initialize(struct wld_context *context, const struct wld_context_impl *impl)
8 {
9 *((const struct wld_context_impl **)&context->impl) = impl;
10 }
M
font.c
+2,
-4
1@@ -60,8 +60,7 @@ wld_font_destroy_context(struct wld_font_context *context)
2
3 EXPORT
4 struct wld_font *
5-wld_font_open_name(struct wld_font_context *context,
6- const char *name)
7+wld_font_open_name(struct wld_font_context *context, const char *name)
8 {
9 FcPattern *pattern, *match;
10 FcResult result;
11@@ -82,8 +81,7 @@ wld_font_open_name(struct wld_font_context *context,
12
13 EXPORT
14 struct wld_font *
15-wld_font_open_pattern(struct wld_font_context *context,
16- FcPattern *match)
17+wld_font_open_pattern(struct wld_font_context *context, FcPattern *match)
18 {
19 char *filename;
20 struct font *font;
M
intel.c
+1,
-2
1@@ -222,8 +222,7 @@ context_destroy(struct wld_context *base)
2
3 /**** Renderer ****/
4 uint32_t
5-renderer_capabilities(struct wld_renderer *renderer,
6- struct buffer *buffer)
7+renderer_capabilities(struct wld_renderer *renderer, struct buffer *buffer)
8 {
9 if (buffer->base.impl == &wld_buffer_impl)
10 return WLD_CAPABILITY_READ | WLD_CAPABILITY_WRITE;
+1,
-2
1@@ -90,8 +90,7 @@ intel_batch_initialize(struct intel_batch *batch,
2 return false;
3
4 /* Alignment argument (4096) is not used */
5- batch->bo = drm_intel_bo_alloc(bufmgr, "batchbuffer",
6- sizeof batch->commands, 4096);
7+ batch->bo = drm_intel_bo_alloc(bufmgr, "batchbuffer", sizeof batch->commands, 4096);
8
9 if (!batch->bo)
10 return false;
+3,
-3
1@@ -269,9 +269,9 @@ xy_text_immediate_blt(struct intel_batch *batch,
2 intel_batch_add_dword(batch, *immediates++);
3
4 /* From BLT engine documentation:
5- *
6- * The IMMEDIATE_BLT data MUST transfer an even number of doublewords. The
7- * BLT engine will hang if it does not get an even number of doublewords. */
8+ *
9+ * The IMMEDIATE_BLT data MUST transfer an even number of doublewords. The
10+ * BLT engine will hang if it does not get an even number of doublewords. */
11 if (count & 1)
12 intel_batch_add_dword(batch, 0);
13
+19,
-24
1@@ -95,24 +95,24 @@ driver_create_context(int drm_fd)
2
3 switch (context->device->chipset & ~0xf) {
4 /* TODO: Support NV50
5- case 0x50:
6- case 0x80:
7- case 0x90:
8- case 0xa0:
9- context->architecture = NV_ARCH_50;
10- break;
11- */
12+ case 0x50:
13+ case 0x80:
14+ case 0x90:
15+ case 0xa0:
16+ context->architecture = NV_ARCH_50;
17+ break;
18+ */
19 case 0xc0:
20 case 0xd0:
21 context->architecture = NV_ARCH_C0;
22 break;
23 /* TODO: Support NVE0
24- case 0xe0:
25- case 0xf0:
26- case 0x100:
27- context->architecture = NV_ARCH_E0;
28- break;
29- */
30+ case 0xe0:
31+ case 0xf0:
32+ case 0x100:
33+ context->architecture = NV_ARCH_E0;
34+ break;
35+ */
36 default:
37 return NULL;
38 }
39@@ -149,16 +149,14 @@ nv_add_dword(struct nouveau_pushbuf *push, uint32_t dword)
40 }
41
42 static inline void
43-nv_add_dwords_va(struct nouveau_pushbuf *push,
44- uint16_t count, va_list dwords)
45+nv_add_dwords_va(struct nouveau_pushbuf *push, uint16_t count, va_list dwords)
46 {
47 while (count--)
48 nv_add_dword(push, va_arg(dwords, uint32_t));
49 }
50
51 static inline void
52-nv_add_data(struct nouveau_pushbuf *push,
53- void *data, uint32_t count)
54+nv_add_data(struct nouveau_pushbuf *push, void *data, uint32_t count)
55 {
56 memcpy(push->cur, data, count * 4);
57 push->cur += count;
58@@ -188,16 +186,13 @@ enum {
59 };
60
61 static inline uint32_t
62-nvc0_command(uint8_t type, uint8_t subchannel,
63- uint16_t method, uint16_t count_or_value)
64+nvc0_command(uint8_t type, uint8_t subchannel, uint16_t method, uint16_t count_or_value)
65 {
66 return type << 29 | count_or_value << 16 | subchannel << 13 | method >> 2;
67 }
68
69 static inline void
70-nvc0_inline(struct nouveau_pushbuf *push,
71- uint8_t subchannel, uint16_t method,
72- uint16_t value)
73+nvc0_inline(struct nouveau_pushbuf *push, uint8_t subchannel, uint16_t method, uint16_t value)
74 {
75 nv_add_dword(push, nvc0_command(GF100_COMMAND_TYPE_INLINE,
76 subchannel, method, value));
77@@ -606,7 +601,7 @@ renderer_draw_text(struct wld_renderer *base,
78
79 nvc0_2d(renderer->pushbuf, G80_2D_SIFC_WIDTH, 10,
80 /* Use the pitch instead of width to ensure the correct
81- * alignment is used. */
82+ * alignment is used. */
83 glyph->bitmap.pitch * 8, glyph->bitmap.rows,
84 0, 1, 0, 1,
85 0, origin_x + glyph->x, 0, y + glyph->y);
86@@ -652,7 +647,7 @@ buffer_map(struct buffer *base)
87 struct nouveau_buffer *buffer = nouveau_buffer(&base->base);
88
89 /* If the buffer is tiled, it cannot be mapped into virtual memory in order
90- * to appear linear like intel can do with map_gtt. */
91+ * to appear linear like intel can do with map_gtt. */
92 if (buffer->bo->config.nvc0.tile_mode)
93 return false;
94
M
pixman.c
+4,
-5
1@@ -165,11 +165,10 @@ context_destroy(struct wld_context *context)
2 }
3
4 uint32_t
5-renderer_capabilities(struct wld_renderer *renderer,
6- struct buffer *buffer)
7+renderer_capabilities(struct wld_renderer *renderer, struct buffer *buffer)
8 {
9 /* The pixman renderer can read and write to any buffer using it's map
10- * implementation. */
11+ * implementation. */
12 return WLD_CAPABILITY_READ | WLD_CAPABILITY_WRITE;
13 }
14
15@@ -372,7 +371,7 @@ renderer_draw_text(struct wld_renderer *base,
16 font, glyph);
17
18 /* If we don't have the glyph in our cache, do some conversions to make
19- * pixman happy, and then insert it. */
20+ * pixman happy, and then insert it. */
21 if (!glyphs[index].glyph) {
22 uint8_t *src, *dst;
23 uint32_t row, byte_index, bytes_per_row, pitch;
24@@ -392,7 +391,7 @@ renderer_draw_text(struct wld_renderer *base,
25
26 for (row = 0; row < bitmap->rows; ++row) {
27 /* Pixman's A1 format expects the bits in the opposite order
28- * that Freetype gives us. Sigh... */
29+ * that Freetype gives us. Sigh... */
30 for (byte_index = 0; byte_index < bytes_per_row; ++byte_index)
31 dst[byte_index] = reverse(src[byte_index]);
32
+6,
-12
1@@ -24,8 +24,7 @@
2 #include "wld-private.h"
3
4 void
5-default_fill_region(struct wld_renderer *renderer, uint32_t color,
6- pixman_region32_t *region)
7+default_fill_region(struct wld_renderer *renderer, uint32_t color, pixman_region32_t *region)
8 {
9 pixman_box32_t *box;
10 int num_boxes;
11@@ -59,8 +58,7 @@ default_copy_region(struct wld_renderer *renderer, struct buffer *buffer,
12 }
13
14 void
15-renderer_initialize(struct wld_renderer *renderer,
16- const struct wld_renderer_impl *impl)
17+renderer_initialize(struct wld_renderer *renderer, const struct wld_renderer_impl *impl)
18 {
19 *((const struct wld_renderer_impl **)&renderer->impl) = impl;
20 renderer->target = NULL;
21@@ -75,16 +73,14 @@ wld_destroy_renderer(struct wld_renderer *renderer)
22
23 EXPORT
24 uint32_t
25-wld_capabilities(struct wld_renderer *renderer,
26- struct wld_buffer *buffer)
27+wld_capabilities(struct wld_renderer *renderer, struct wld_buffer *buffer)
28 {
29 return renderer->impl->capabilities(renderer, (struct buffer *)buffer);
30 }
31
32 EXPORT
33 bool
34-wld_set_target_buffer(struct wld_renderer *renderer,
35- struct wld_buffer *buffer)
36+wld_set_target_buffer(struct wld_renderer *renderer, struct wld_buffer *buffer)
37 {
38 if (!renderer->impl->set_target(renderer, (struct buffer *)buffer))
39 return false;
40@@ -96,8 +92,7 @@ wld_set_target_buffer(struct wld_renderer *renderer,
41
42 EXPORT
43 bool
44-wld_set_target_surface(struct wld_renderer *renderer,
45- struct wld_surface *surface)
46+wld_set_target_surface(struct wld_renderer *renderer, struct wld_surface *surface)
47 {
48 struct buffer *back_buffer;
49
50@@ -117,8 +112,7 @@ wld_fill_rectangle(struct wld_renderer *renderer, uint32_t color,
51
52 EXPORT
53 void
54-wld_fill_region(struct wld_renderer *renderer, uint32_t color,
55- pixman_region32_t *region)
56+wld_fill_region(struct wld_renderer *renderer, uint32_t color, pixman_region32_t *region)
57 {
58 renderer->impl->fill_region(renderer, color, region);
59 }
+3,
-6
1@@ -32,16 +32,14 @@ default_create_surface(struct wld_context *context,
2 }
3
4 void
5-surface_initialize(struct wld_surface *surface,
6- const struct wld_surface_impl *impl)
7+surface_initialize(struct wld_surface *surface, const struct wld_surface_impl *impl)
8 {
9 *((const struct wld_surface_impl **)&surface->impl) = impl;
10 }
11
12 EXPORT
13 pixman_region32_t *
14-wld_surface_damage(struct wld_surface *surface,
15- pixman_region32_t *new_damage)
16+wld_surface_damage(struct wld_surface *surface, pixman_region32_t *new_damage)
17 {
18 return surface->impl->damage(surface, new_damage);
19 }
20@@ -55,8 +53,7 @@ wld_surface_take(struct wld_surface *surface)
21
22 EXPORT
23 void
24-wld_surface_release(struct wld_surface *surface,
25- struct wld_buffer *buffer)
26+wld_surface_release(struct wld_surface *surface, struct wld_buffer *buffer)
27 {
28 surface->impl->release(surface, (struct buffer *)buffer);
29 }
+2,
-2
1@@ -274,8 +274,8 @@ buffer_socket_process(struct buffer_socket *base)
2 struct wayland_buffer_socket *socket = wayland_buffer_socket(base);
3
4 /* Since events for our wl_buffers lie in a special queue used by WLD, we
5- * must dispatch these events here so that we see any release events before
6- * the next back buffer is chosen. */
7+ * must dispatch these events here so that we see any release events before
8+ * the next back buffer is chosen. */
9 wl_display_dispatch_queue_pending(socket->display, socket->queue);
10 }
11
+5,
-5
1@@ -34,14 +34,14 @@ struct wl_surface;
2
3 enum wld_wayland_interface_id {
4 /**
5- * Give up on trying any new interfaces. This can be considered as a
6- * sentinel for wld_wayland_create_context.
7- */
8+ * Give up on trying any new interfaces. This can be considered as a
9+ * sentinel for wld_wayland_create_context.
10+ */
11 WLD_NONE = -2,
12
13 /**
14- * Try any available interface.
15- */
16+ * Try any available interface.
17+ */
18 WLD_ANY = -1,
19 WLD_DRM,
20 WLD_SHM
+5,
-5
1@@ -59,13 +59,13 @@ struct glyph {
2 FT_Bitmap bitmap;
3
4 /**
5- * The offset from the origin to the top left corner of the bitmap.
6- */
7+ * The offset from the origin to the top left corner of the bitmap.
8+ */
9 int16_t x, y;
10
11 /**
12- * The width to advance to the origin of the next character.
13- */
14+ * The width to advance to the origin of the next character.
15+ */
16 uint16_t advance;
17 };
18
19@@ -119,7 +119,7 @@ struct wld_renderer_impl {
20 struct buffer {
21 struct wld_buffer base;
22
23- unsigned references, map_references;
24+ unsigned ref, map_ref;
25 struct wld_exporter *exporters;
26 struct wld_destructor *destructors;
27 };