commit c518ef4

Michael Forney  ·  2014-02-19 23:40:59 +0000 UTC
parent dbead1d 
framebuffer_plane: Drop swc_ prefix for non-public structures/functions
3 files changed,  +16, -16
M libswc/framebuffer_plane.c
M libswc/framebuffer_plane.h
M libswc/screen.c
M libswc/framebuffer_plane.c
+8, -8 
 1@@ -78,14 +78,14 @@ static bool update(struct swc_view * view)
 2 
 3 static void send_frame(void * data)
 4 {
 5-    struct swc_framebuffer_plane * plane = data;
 6+    struct framebuffer_plane * plane = data;
 7 
 8     swc_view_frame(&plane->view, swc_time());
 9 }
10 
11 static bool attach(struct swc_view * view, struct wld_buffer * buffer)
12 {
13-    struct swc_framebuffer_plane * plane
14+    struct framebuffer_plane * plane
15         = CONTAINER_OF(view, typeof(*plane), view);
16     union wld_object object;
17 
18@@ -161,16 +161,16 @@ const static struct swc_view_impl view_impl = {
19 
20 static void handle_page_flip(struct swc_drm_handler * handler, uint32_t time)
21 {
22-    struct swc_framebuffer_plane * plane
23+    struct framebuffer_plane * plane
24         = CONTAINER_OF(handler, typeof(*plane), drm_handler);
25 
26     swc_view_frame(&plane->view, time);
27 }
28 
29-bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
30-                                      uint32_t crtc, struct swc_mode * mode,
31-                                      uint32_t * connectors,
32-                                      uint32_t num_connectors)
33+bool framebuffer_plane_initialize(struct framebuffer_plane * plane,
34+                                  uint32_t crtc, struct swc_mode * mode,
35+                                  uint32_t * connectors,
36+                                  uint32_t num_connectors)
37 {
38     uint32_t * plane_connectors;
39 
40@@ -218,7 +218,7 @@ bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
41     return false;
42 }
43 
44-void swc_framebuffer_plane_finalize(struct swc_framebuffer_plane * plane)
45+void framebuffer_plane_finalize(struct framebuffer_plane * plane)
46 {
47     wl_array_release(&plane->connectors);
48     drmModeCrtcPtr crtc = plane->original_crtc_state;
M libswc/framebuffer_plane.h
+6, -6 
 1@@ -29,7 +29,7 @@
 2 #include "surface.h"
 3 #include "view.h"
 4 
 5-struct swc_framebuffer_plane
 6+struct framebuffer_plane
 7 {
 8     uint32_t crtc;
 9     drmModeCrtcPtr original_crtc_state;
10@@ -40,12 +40,12 @@ struct swc_framebuffer_plane
11     struct swc_drm_handler drm_handler;
12 };
13 
14-bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
15-                                      uint32_t crtc, struct swc_mode * mode,
16-                                      uint32_t * connectors,
17-                                      uint32_t num_connectors);
18+bool framebuffer_plane_initialize(struct framebuffer_plane * plane,
19+                                  uint32_t crtc, struct swc_mode * mode,
20+                                  uint32_t * connectors,
21+                                  uint32_t num_connectors);
22 
23-void swc_framebuffer_plane_finalize(struct swc_framebuffer_plane * plane);
24+void framebuffer_plane_finalize(struct framebuffer_plane * plane);
25 
26 #endif
27
M libswc/screen.c
+2, -2 
 1@@ -96,7 +96,7 @@ struct screen * screen_new(uint32_t crtc, struct swc_output * output)
 2     return screen;
 3 
 4   error2:
 5-    swc_framebuffer_plane_finalize(&screen->planes.framebuffer);
 6+    framebuffer_plane_finalize(&screen->planes.framebuffer);
 7   error1:
 8     free(screen);
 9   error0:
10@@ -109,7 +109,7 @@ void screen_destroy(struct screen * screen)
11 
12     wl_list_for_each_safe(output, next, &screen->outputs, link)
13         swc_output_destroy(output);
14-    swc_framebuffer_plane_finalize(&screen->planes.framebuffer);
15+    framebuffer_plane_finalize(&screen->planes.framebuffer);
16     swc_cursor_plane_finalize(&screen->planes.cursor);
17     free(screen);
18 }