commit 0aea280

Michael Forney  ·  2014-01-01 07:32:07 +0000 UTC
parent cc21dfa 
Style: pixman_format -> format_wld_to_pixman
3 files changed,  +4, -3
M intel.c
M pixman.c
M wld-private.h
M intel.c
+2, -1 
 1@@ -332,7 +332,8 @@ pixman_image_t * intel_map(struct wld_drawable * drawable)
 2     {
 3         drm_intel_gem_bo_map_gtt(intel->bo);
 4         intel->virtual = pixman_image_create_bits_no_clear
 5-            (pixman_format(drawable->format), drawable->width, drawable->height,
 6+            (format_wld_to_pixman(drawable->format),
 7+             drawable->width, drawable->height,
 8              intel->bo->virtual, drawable->pitch);
 9         pixman_image_set_destroy_function(intel->virtual, &destroy_virtual,
10                                           intel);
M pixman.c
+1, -1 
1@@ -112,7 +112,7 @@ bool pixman_initialize_drawable
2     drawable->base.pitch = pitch;
3 
4     drawable->context = context;
5-    drawable->image = pixman_image_create_bits(pixman_format(format),
6+    drawable->image = pixman_image_create_bits(format_wld_to_pixman(format),
7                                                width, height,
8                                                (uint32_t *) data, pitch);
9
M wld-private.h
+1, -1 
1@@ -119,7 +119,7 @@ static inline uint8_t format_bytes_per_pixel(enum wld_format format)
2     }
3 }
4 
5-static inline pixman_format_code_t pixman_format(uint32_t format)
6+static inline pixman_format_code_t format_wld_to_pixman(uint32_t format)
7 {
8     switch (format)
9     {