commit b5ca637

intel: wld_intel_context -> intel_context

 1@@ -31,7 +31,7 @@
 2 #include <intel_bufmgr.h>
 3 #include <i915_drm.h>
 4 
 5-struct wld_intel_context
 6+struct intel_context
 7 {
 8     drm_intel_bufmgr * bufmgr;
 9     struct intel_batch batch;
10@@ -41,7 +41,7 @@ struct intel_drawable
11 {
12     struct wld_drawable base;
13 
14-    struct wld_intel_context * context;
15+    struct intel_context * context;
16     drm_intel_bo * bo;
17     pixman_image_t * virtual;
18 };
19@@ -71,16 +71,16 @@ static uint32_t intel_get_handle(struct wld_drawable * drawable);
20 
21 /* DRM implementation */
22 static bool intel_device_supported(uint32_t vendor_id, uint32_t device_id);
23-static struct wld_intel_context * intel_create_context(int drm_fd);
24-static void intel_destroy_context(struct wld_intel_context * context);
25+static struct intel_context * intel_create_context(int drm_fd);
26+static void intel_destroy_context(struct intel_context * context);
27 static struct wld_drawable * intel_create_drawable
28-    (struct wld_intel_context * context, uint32_t width, uint32_t height,
29+    (struct intel_context * context, uint32_t width, uint32_t height,
30      uint32_t format);
31 static struct wld_drawable * intel_import
32-    (struct wld_intel_context * context, uint32_t width, uint32_t height,
33+    (struct intel_context * context, uint32_t width, uint32_t height,
34      uint32_t format, int prime_fd, unsigned long pitch);
35 static struct wld_drawable * intel_import_gem
36-    (struct wld_intel_context * context, uint32_t width, uint32_t height,
37+    (struct intel_context * context, uint32_t width, uint32_t height,
38      uint32_t format, uint32_t gem_name, unsigned long pitch);
39 
40 const static struct drm_draw_interface intel_draw = {
41@@ -113,9 +113,9 @@ bool intel_device_supported(uint32_t vendor_id, uint32_t device_id)
42     return vendor_id == 0x8086;
43 }
44 
45-struct wld_intel_context * intel_create_context(int drm_fd)
46+struct intel_context * intel_create_context(int drm_fd)
47 {
48-    struct wld_intel_context * context;
49+    struct intel_context * context;
50 
51     context = malloc(sizeof *context);
52 
53@@ -128,13 +128,13 @@ struct wld_intel_context * intel_create_context(int drm_fd)
54     return context;
55 }
56 
57-void intel_destroy_context(struct wld_intel_context * context)
58+void intel_destroy_context(struct intel_context * context)
59 {
60     drm_intel_bufmgr_destroy(context->bufmgr);
61     free(context);
62 }
63 
64-static struct intel_drawable * new_drawable(struct wld_intel_context * context,
65+static struct intel_drawable * new_drawable(struct intel_context * context,
66                                             uint32_t width, uint32_t height,
67                                             uint32_t format)
68 {
69@@ -154,7 +154,7 @@ static struct intel_drawable * new_drawable(struct wld_intel_context * context,
70 }
71 
72 struct wld_drawable * intel_create_drawable
73-    (struct wld_intel_context * context, uint32_t width, uint32_t height,
74+    (struct intel_context * context, uint32_t width, uint32_t height,
75      uint32_t format)
76 {
77     struct intel_drawable * intel;
78@@ -170,7 +170,7 @@ struct wld_drawable * intel_create_drawable
79     return &intel->base;
80 }
81 
82-struct wld_drawable * intel_import(struct wld_intel_context * context,
83+struct wld_drawable * intel_import(struct intel_context * context,
84                                    uint32_t width, uint32_t height,
85                                    uint32_t format,
86                                    int prime_fd, unsigned long pitch)
87@@ -188,7 +188,7 @@ struct wld_drawable * intel_import(struct wld_intel_context * context,
88     return &intel->base;
89 }
90 
91-struct wld_drawable * intel_import_gem(struct wld_intel_context * context,
92+struct wld_drawable * intel_import_gem(struct intel_context * context,
93                                        uint32_t width, uint32_t height,
94                                        uint32_t format,
95                                        uint32_t gem_name, unsigned long pitch)